Fix tests, minor refactoring.

 - Fix failing tests
 - Minor refactoring on Rusen::Notification