Merge "Add more deps in salt model testing"