Refactor unit tests for simpler dependencies

[thclark]

Unit tests are having to be separated into separate modules, depending on their imports, to avoid duplicate imports. This is unscalable, and not the way we should be doing it. Once #57 is complete, the constraint will be fixed, allowing us to pul unit tests together again into logical unit test executables.