Switch to all assertions in apply_diff
Also disable apply_patch