Cleanup unused imports
Use the test client instead of the factory
Prepare for release