Touchups: to long-running tests.