Relay scope from the original request
Scopes should reflect original request, not arbitrarily chosen set for testing purposes.
This change set also unifies handling error messages and Gomega matcher notation.
Signed-off-by: Paweł Wieczorek pawel.wieczorek@collabora.com