Messages moved to dedicated template
Fix: Corrected discovery of popup text in tests