Fix order-dependent tests.