Add notification process
Some fixes
Add unit tests