Cleaned up some tests and removed erroneous validation on Notification.