Merge "Remove unnecessary variable from UserTest"