Fix more tests, w/r/t PINTO_DIFF_STYLE.