Merge "Create symlink structure for multivalent tests" into main