Remove unused imports
Add missing imports and missing test
Remove obsolete field
Fix imports
Remove bad dependencies
Fix buggy test