More fall out from my notification clean up. I've added back some explicit tests.