Tests improved with shorthand FactoryGirl units