Merge "Remove unused code in user test"