Refactored tests, added Collection model