Add shared examples and update specs
Merge branch 'specs_refactor'

* specs_refactor:
  Add shared examples and update specs
Fix breaking spec