Moved the unittest imports to be global.

This, along with a couple of other commits will end up getting removed from the pull request and compacted down into a smaller set of commits.