Revert "doctests were relying on earlier imports?"

This reverts commit d3761e84aac79c0220560a14d4eb22d8df935014.
better fix for dependency on modules imported at top level