Add factory_girl_rails & refactor tests to use factories