Fix tests and imports
Fix tests and imports