Tidied up Tester