fixed imports
added unit tests