Fix Rubocop HashSyntax
Fix some rubocop errors introduced in the rspec upgrade