Fixups for new dependencies

Last commit updating dependencies requires a test fix and required one more related dependency update to fix a build break.