Got the tests running
First version after refactoring for redistribution on github and pypi.