Automated testing fixes:
 - There's no sys.maxint in python3
 - We use OrderedDict, so can't build on 2.6