Patched up some import statements.
- This is part of a larger goal, to figure out why unit tests work individually
  but do not work when run all together.
- "Individually" means > py.test  path-to-one-test-file.py
- "All together" means > py.test