Adds a few notification tests and cleans up code. bjmcmorran