Add more notifications and fix unit tests
Fix Api functional tests