Various class name improvements in testsuite