fix script_vals_identical custom test so it works with skip
fix conflict