Clean up unused imports
Get tests to run