Testing improvements

Fix Systemd testing and improve overall rspec testing