First changes to Tester