Fix another set of test breakages on NVIDIA.