Simplified Alerts object, improved tests