Update fixtures helper to search sub-directories
Refactor collection spec with third file
Collection spec is complete