Fix model associations and FactoryGirl tests.