bengler_test_helper tweaks.
Merge branch 'master' into upgrade-ominauth-oauth2

* master:
  bengler_test_helper tweaks.
Merge in master and update a test