More corrections to UserTest