Added some extra test cases.