Added unit test to model integrity and refactored legacy test suite.
Merge pull request #4 from halldorel/unit-test-refactoring

Added unit test to model integrity and refactored legacy test suite.