Added further tests.