Removes collection specific code
Add new Collection wrapper class
Add test suite for new Collection class