Added some further test cases