Fixes and improvements for tester