Adapted testsuite to changes in Service module