Updated rspecs to rspec-3x syntax, fixed warnings