Merge changes I2ed2843e,Ic53a4511 into main

* changes:
  Update notification wrapper tests to use the latest NotificationTestHelper
  Update NotificationGutsManagerTest to use the updated NotificationTestHelper