Adapted testsuite to changes in Service module.
Merge pull request #182 from mchf/fix-testsuite

Adapted testsuite to changes in Service module.