Improve testablility
Version bump