Added some more testcases.