Work on the tester class a bit