Fix test class name conflict causing weird test failures