Merge branch 'hotfix/test-fixes'

Fixes unit test runner
[#42] Ensure the api-identity service is not set twice

- As the second attempt will raise an exception.
Merge branch 'hotfix/42' into develop

Forward port #42