[C]Refactor of unit tests to use FactoryGirl