Refactoring. Create Model Builders to make tests easier and cleaner.