Fix broken test that relied on patching internals and lint

[aabmass]

This code has suffered from some bit rot while new dependency versions came out. Lint issues are caused by https://github.com/protocolbuffers/protobuf/issues/10372