small tweaks to tester
more tweaks
optimized tests