A lot of work on the tester