Merge "Remove unused local variables in tests"