Fixed tester and added base tests