Small tester tweaks