Generic Service Test
Merge pull request #1315 from sshveta/moreservicetests

More Generic service tests