Improve flakey unit tests.