Update RSpec and use RSpec 3.0 syntax