Added some extra features to my tester.