Fix unit tests (issue #65)