[C]Refactor of unit tests to use Factory Girl
[C]Refactor of unit tests to use Factory Girl