Added notification tracking + updated tests.