Merge "Fix salt model testing"