Merge pull request #2346 from ilya-lavrenov:umat_tests_cleanup