TST: Explicitly use relative imports and clean up tests