Merge "Making some classess accessible in multivalent tests" into main