Updating tests for new rspec and accounting for ruby 2