Bump rspec to verison 3
Replace some rspec old syntax