Added some additional test cases