Refactors test cases which now extends TestSupport