x86: cpa self-test fixes