Merge "Fix the CPU_*_S tests."