Add notificatiosn bubbles and tests