Added further test cases.