Fix the failing test for Python 3.4 OrderedDict.

However, a throughout review is in order.