rename test classes to match new names of classes they test