Fix some tests that only fail when running in parallel.