removed unused methods
fixed notification handling
added new test + fixed other tests
just added new tests