Merge "Enable currently functional multivalent tests" into main