Merge "Move multivalent test targets to multivalentTests dir" into main