Added a few more test cases