Finish rspec remake