Moved the unit tests for models into a specific models directory to allow some better packaging of tests.
Reworked some existing unit tests to clarify the expected function of the model code.