more tests, and start of collection handling too