Make x86 test actually test x86 code generation. Fix the