insist on cleaner setup of models in tests - collections_test refactored