Don't depend on dict ordering in tests

Fixes tests for Python 3.3, which finally causes some broken tests to fail by
having a different default dict ordering.