Fix broken specs and better handling of notification with notify-send