Fixed a broken integration test.

AFDP-105
Refactored some commands to include notifications internally.

AFDP-105