Lots of tester enhancements