Cleaning up the Generic Collection factory
More unit testing
Fixing unit tests