USER_2048 and IS_VALID_NAME test modified