Fixes includes and improves notification test messages
Fixes inclusion problem, clearing messages on tokenunblock