- restructure the way these tests are run