Correct class names

Some test cases have been renamed, to make the ANT file work, we need to change the class name on ANT too.