Fixed testsuite

- We can't adapt the old testsuite to the new Systemd/Service library, so it's a bit shorter
- Little refactoring included