Fix Systemd service manager

Systemd was failing with the new tests.
Refactored sequencing.