Reduced inter-dependence of tests by moving more 'test' calls into the same files