get the cpu branch tests passing again