Rename test classes to be consistent