More work for tester class