Added basic tester functionality