Add tester classes, fix some methods