Make Alerts tests working again
Merge pull request #1237 from mfalesni/alert-fix

Make Alerts tests working again!