Updated tests to reflect changes to notification system. jakehaas