Issue: fixed scope deprecation warnings
Notification: general code cleanup
Notification: added tests