Fill out more tests for the collection handler.
Simplify
This is no longer needed.
Simplify
Missed this change...