#73 Fix unit-tests