Some changes to tester