fixed using DialogListener as it breaks the macro recorder, using TextListener instead
updated test
fixed plural and singular names, added underscores for macro recording