Refactor:
Added tests
Version bump