updates to notifications along with additional tests.
Updates to tests and models.