Fix packaging
Refactoring tests
bump version