Refactor tests so they can be used from other modules
bump versiobn