Merge "Match name of test class to filename. Fixes bug 1006193."