Make the tester more user friendly