Fixing unit tests for model service