Merge "Fix failing tests" into main