feature for removed alerts
Bug fix and created some tests