fixed specs and added new specs
Merge branch 'feature/catch_all_request_toggle' into 0.9.0-plus

* feature/catch_all_request_toggle:
  fixed specs and added new specs