Fix a test.
Try to fix another random failure.