fix failing unit tests