Conditional event check, GUID appended to app name, fixed test