Notification infrastructure added for tests