Implemented notify functionality.
Tiny tweaks for better code coverage.