Fix more rubocop errors
Clean up
Fix bug with Faker not setting icon and history url