Converted some tests to use FactoryGirl instead of AR