Converting tests that directly extends TestCase