Remove unused imports
Export public stuff and add tests