Cleanup tests imports for patched methods