Merge "Remove unused variables in test" into main