Merge "Fix some broken tests" into main