Fix Systemd service manager

Systemd was failing with the new tests.
Refactored sequencing.
Merge pull request #169 from electrical/fix_systemd

Fix Systemd service manager