Modify registration to use orchestra/notifier.

Signed-off-by: crynobone <crynobone@gmail.com>
Improve mocking to use real class when possible.

Signed-off-by: crynobone <crynobone@gmail.com>