Merge "Remove unused test var" into main