cleaned up the test cases