Accommodating latest changes to Tester