Corrections to UserTest