Updated Tester class