Fix failing testsuite do to changes in Service
Merge pull request #15 from vmoravec/fix-testsuite

Fix failing testsuite do to changes in Service