Fix order dependent tests