More RSpec 3 related updates to specs