fix map order dependent tests