Merge "Fix test-salt-model`"