Dependency updates, fix failing unit test