Refactor/rspec

First step of the Rspec refactoring for #1737 
Not sure if its even used anywhere :p but will change it.