Update RSpec
Fix tests for 1.8.7