Lots of fixes to support new tester file