Fix scopes.
Fix tests.
Adding response_type

Signed-off-by: Adam Engebretson <adam@enge.me>