Add some comments / refactor tester class