Hmm, maybe this means we should use __all__ to avoid exporting these imports.
This won't end up in the final patch set, just leave here for now. Also makes nose ignore the test code.
