Fixed some missing imports in the plotting script, and two incorrectly referenced modules in *_test.py