a755104
Fix the test suite. We had some circular imports that caused the tests (and more?) to fail. I ran into this when looking at the tests for #583 and #595.