Refactored
Fixed wrong tests
Fixed collection hydrate