Fixed s_expected_value() test
Sort strategies. Add expressions in concatination