Test Data Builder
* Implemented a Test Data Builder pattern in the factories
* Refactored controller Unit tests