WIP rspec
WIP rspec upgrade