Merge "Migrate model tests to multivalent" into main