clean up feel spec based on model prepopulation expectations
modify GC to speed rspec tests