Issue #73 Fix tests