Fixed unittests.
Cleanup and began on notification test.