Add some further test cases.