Added test cases
Fixed tester