Added more steps to notification tests, made alterations to other tests. Still a work in progress and some tests are still failing.