Fixed bug related to policies containing a service-id

Jira-issue: WP-1141
Added tests related to services

Jira-issue: WP-1141
Merge pull request #38 from ccameroni/WP-1141-fix-service-id

WP-1141 fix service-id evaluation