Should these go in `cpp-common/src/ut` instead?