Less fragile tests.