Tester improvements and performance tweaks