Fixes for Alerts Unit Tests