Refactor/rspec

First step of the Rspec refactoring for #1737 
oops.