Fix #407 & start functionally testing systemd pkg