Adapted testsuite to the latest Service module state
Adapted BuildRequires

- That's related to new Service module and adapted testsuite