Some more tests and collection fixes