x86: fold NOP testcase expectations where possible Like done earlier for files needing adjustment anyway, also do this for the remaining set.