Make imports public
Add space
Add some stuff
More unittests