Use OrderedDict instead of dict in test_qadapters.py because the hash algorithm has been changed in py3k
Automatic Py3k merge for testing