Rubocop and RSpec 3.0 fixes