Revert "Fix running tests through ipython"

This reverts commit 8e245fd739562084e849d7dbcda17ca70385c212.
The reason is that it increases the time it takes to run tests because
it (completely illogically) ignores @nottest above the runTest method.

Change-Id: I191f515bbe486f3902fff240b312adcad157dd93