More follow-up on recent test case failures.