Merge "Fix broken tests" into main