Spec fixes for RSpec 3