All collection tests pass now.

Now only the entity and the interceptor tests need some love.