fixing up test class names