Updated scenarios according to latest flash messages changes