new class Notification and tests
modifications