Add missing tests for Service controller

Change-Id: I18819011b9019a1efef1d5d8a78062b3829ca488
Merge "Add missing tests for Service controller"