Fix ipython tests
Merge branch 'fix-ipython-tests' into develop