Cleanup test failures from #4124.