Adjustments to VariantTypeTest.