Fix tests && circular imports.