Cleaned the tester up a bit