Refactor/rspec

First step of the Rspec refactoring for #1737 
All other tests had ports increasing, wanted to make sure the rest followed the same. Should be a random port indeed.