Merge "Fixing the broken test" into main