Fixing more racy tests.