Revert "Merge pull request #19 from rlane/move-oftest"

This reverts commit 130b6a33a9858351886668f7ef07be121cc6a0e1, reversing
changes made to 5d2a768c671a549473f68131a0fc11737bf43952.

Moving testutils.py broke some imports.
3 files changed