Fix IPython.testing tests for Python 2
Fix IPython.utils tests on Python 2
Undo some incorrect automated changes to autoreload extension