Refactory tests to inherit from AbstractTestCase