Fix failing testsuite do to changes in Service