Refactor/rspec

First step of the Rspec refactoring for #1737 
Curious; why change the port? Also, imo this should be random port (but we can fix that in the future outsie of this PR)