Merge "Revert "Refactored test salt formulas env pipeline""