Added some new test cases