Tests refactored, new model unit tests added.