Slight changes in User tests