Refactor collections_spec (more to come)