Actually fix test class declarations