More WIP
Pending tests for notification errors