Improved tests and bug fix (retrieve not sent decorated notifs)