Refactor collection spec (WIP)