Adapt service units and systemctl
Add tests for service and adapt the rest