updates to test_alerts OOIION-1321

This should be the rel2.0 portion of the dual pull request.