Convert tests to use FactoryGirl. Removed Fixie