redo of the collection and adding tests