Test fixes for tests that seem to fail intermittently on machines with lots of cores.