Continued refactoring and simplification of tester API