Improved some brittle tests.