Merge branch 'develop'
Changed Exception name and updated test
Merge branch 'master' into develop
Changed Exception for missing service to InvalidArgumentException