HOTFIX:
- Fix imports
- Remove test