fix order-dependent tests