Tester fixes

More work tryinf to get tester to work