Start re-organizing the tests more intelligently