updates to test_alerts
Merge pull request #1357 from unwin/roger_rebase2

updates to test_alerts OOIION-1321