Merge "Fix test" into main