Add tests for modelToSave