Some more tests, etc.