Refactor tests, add one to check is the collection is correctly formed