Added some more tests to cover more scenarios