Cleaned up division of tester code into files