fixed failing unit tests