Test adjustment
Refactoring Alert handling