Improve collection retrieval tests.