Merge "Fix dir in test-salt-models"