Integrate steves updates
Fixup some tests.
Fix the send_notification related test errors
Fix up that last lingering test case