update to newer rspec and other gems, and fix tests