BDD cleanup to make scenarios more readable.
Adding support for OAuth 1