Added new test model.
Refactoring for clarity.