Issue #167: fixed failing unit tests.