More tests, more coverage.
Shuffled the versions of six/OrderedDict/json we depend on.