Added further test cases