Merge "Move BC25 tests to multivalents" into main