Clarifying docblock, because scrutinizer is addicting
Improve tests, remove duplication and correct collection persistence test