Fixed test failures

- Introduced by #66 -- expectations of service names are now
  different, so updated tests to reflect the changes.
Merge branch 'hotfix/test-fixes'

Fixed tests broken by #66