Fixed bugs in smart alerts
Test updates