Fix brittle tests.