restructure the tests