Added unit tests
cleaned imports