Tidy imports
Fix tests