Fixing CollectionRepositoryTest
Updating unit tests
Updating tests