Add alerts + extended test coverage