Adding yet more tests.