added all test cases back