Fix order-dependency in tests