we don't need ordereddict in tests anymore