Fix KeyError 'service' in services test module#1194

jboddey merged 3 commits intogoogle:devgoogle/testrun:devfrom

MariusBaldovin:bug/scanMariusBaldovin/testrun:bug/scanCopy head branch name to clipboard