Less imports
Added unit test suite (nosetests)