- Adding some basic tests
- Alerting working