restructuring the tests