Wrote some more test cases