Merge pull request #7 from kobliha/master

Testsuites adapted to changes in Service module (bnc#807507)