Issue #115 - unittest added