Fixed existing test cases. Deleted irrelevant test cases, added some new test cases