- More collection tests
- fixed trait merging

Stef