minor cleanups of ObjectVariantMapper regtest