Merge "Fixed salt models and formulas testing"