ref #4: fixed failing unit tests