Fix bad auto-import mix up
Fix instantiation of module dependencies
More unit test fixes
Fix unit test
Merge pull request #141 from elandau/master

Fix a bunch of unit tests