Fix UshmmTest, use new test file, remove old test files