Refactor tests; move solr_field setting into initialize
Merge branch 'feature/administrative-collections' of github.com:avalonmediasystem/avalon into feature/administrative-collections