adjust tests and notification