Fixing and refactoring collection.
Collection tests pass.