Merge "Try to fix salt-models testing"