Refactor NBINotification & add ServiceListener tests