Heh, I seem to keep forgotting to run the tests... should those imports really be there and not on the module level?