better alerts, moar tests