Added the rest of the test cases