diff --git a/tests/components/bang_olufsen/snapshots/test_event.ambr b/tests/components/bang_olufsen/snapshots/test_event.ambr
index 65c3681e41c..f0ee135f98e 100644
--- a/tests/components/bang_olufsen/snapshots/test_event.ambr
+++ b/tests/components/bang_olufsen/snapshots/test_event.ambr
@@ -2,55 +2,6 @@
 # name: test_button_event_creation_a5
   list([
     'binary_sensor.beosound_a5_44444444_charging',
-    'event.beosound_a5_44444444_bluetooth',
-    'event.beosound_a5_44444444_next',
-    'event.beosound_a5_44444444_play_pause',
-    'event.beosound_a5_44444444_favorite_1',
-    'event.beosound_a5_44444444_favorite_2',
-    'event.beosound_a5_44444444_favorite_3',
-    'event.beosound_a5_44444444_favorite_4',
-    'event.beosound_a5_44444444_previous',
-    'event.beosound_a5_44444444_volume',
-    'event.beoremote_one_55555555_44444444_light_blue',
-    'event.beoremote_one_55555555_44444444_light_digit_0',
-    'event.beoremote_one_55555555_44444444_light_digit_1',
-    'event.beoremote_one_55555555_44444444_light_digit_2',
-    'event.beoremote_one_55555555_44444444_light_digit_3',
-    'event.beoremote_one_55555555_44444444_light_digit_4',
-    'event.beoremote_one_55555555_44444444_light_digit_5',
-    'event.beoremote_one_55555555_44444444_light_digit_6',
-    'event.beoremote_one_55555555_44444444_light_digit_7',
-    'event.beoremote_one_55555555_44444444_light_digit_8',
-    'event.beoremote_one_55555555_44444444_light_digit_9',
-    'event.beoremote_one_55555555_44444444_light_down',
-    'event.beoremote_one_55555555_44444444_light_green',
-    'event.beoremote_one_55555555_44444444_light_left',
-    'event.beoremote_one_55555555_44444444_light_play',
-    'event.beoremote_one_55555555_44444444_light_red',
-    'event.beoremote_one_55555555_44444444_light_rewind',
-    'event.beoremote_one_55555555_44444444_light_right',
-    'event.beoremote_one_55555555_44444444_light_select',
-    'event.beoremote_one_55555555_44444444_light_stop',
-    'event.beoremote_one_55555555_44444444_light_up',
-    'event.beoremote_one_55555555_44444444_light_wind',
-    'event.beoremote_one_55555555_44444444_light_yellow',
-    'event.beoremote_one_55555555_44444444_light_function_1',
-    'event.beoremote_one_55555555_44444444_light_function_2',
-    'event.beoremote_one_55555555_44444444_light_function_3',
-    'event.beoremote_one_55555555_44444444_light_function_4',
-    'event.beoremote_one_55555555_44444444_light_function_5',
-    'event.beoremote_one_55555555_44444444_light_function_6',
-    'event.beoremote_one_55555555_44444444_light_function_7',
-    'event.beoremote_one_55555555_44444444_light_function_8',
-    'event.beoremote_one_55555555_44444444_light_function_9',
-    'event.beoremote_one_55555555_44444444_light_function_10',
-    'event.beoremote_one_55555555_44444444_light_function_11',
-    'event.beoremote_one_55555555_44444444_light_function_12',
-    'event.beoremote_one_55555555_44444444_light_function_13',
-    'event.beoremote_one_55555555_44444444_light_function_14',
-    'event.beoremote_one_55555555_44444444_light_function_15',
-    'event.beoremote_one_55555555_44444444_light_function_16',
-    'event.beoremote_one_55555555_44444444_light_function_17',
     'event.beoremote_one_55555555_44444444_control_blue',
     'event.beoremote_one_55555555_44444444_control_digit_0',
     'event.beoremote_one_55555555_44444444_control_digit_1',
@@ -63,6 +14,33 @@
     'event.beoremote_one_55555555_44444444_control_digit_8',
     'event.beoremote_one_55555555_44444444_control_digit_9',
     'event.beoremote_one_55555555_44444444_control_down',
+    'event.beoremote_one_55555555_44444444_control_function_1',
+    'event.beoremote_one_55555555_44444444_control_function_10',
+    'event.beoremote_one_55555555_44444444_control_function_11',
+    'event.beoremote_one_55555555_44444444_control_function_12',
+    'event.beoremote_one_55555555_44444444_control_function_13',
+    'event.beoremote_one_55555555_44444444_control_function_14',
+    'event.beoremote_one_55555555_44444444_control_function_15',
+    'event.beoremote_one_55555555_44444444_control_function_16',
+    'event.beoremote_one_55555555_44444444_control_function_17',
+    'event.beoremote_one_55555555_44444444_control_function_18',
+    'event.beoremote_one_55555555_44444444_control_function_19',
+    'event.beoremote_one_55555555_44444444_control_function_2',
+    'event.beoremote_one_55555555_44444444_control_function_20',
+    'event.beoremote_one_55555555_44444444_control_function_21',
+    'event.beoremote_one_55555555_44444444_control_function_22',
+    'event.beoremote_one_55555555_44444444_control_function_23',
+    'event.beoremote_one_55555555_44444444_control_function_24',
+    'event.beoremote_one_55555555_44444444_control_function_25',
+    'event.beoremote_one_55555555_44444444_control_function_26',
+    'event.beoremote_one_55555555_44444444_control_function_27',
+    'event.beoremote_one_55555555_44444444_control_function_3',
+    'event.beoremote_one_55555555_44444444_control_function_4',
+    'event.beoremote_one_55555555_44444444_control_function_5',
+    'event.beoremote_one_55555555_44444444_control_function_6',
+    'event.beoremote_one_55555555_44444444_control_function_7',
+    'event.beoremote_one_55555555_44444444_control_function_8',
+    'event.beoremote_one_55555555_44444444_control_function_9',
     'event.beoremote_one_55555555_44444444_control_green',
     'event.beoremote_one_55555555_44444444_control_left',
     'event.beoremote_one_55555555_44444444_control_play',
@@ -74,90 +52,62 @@
     'event.beoremote_one_55555555_44444444_control_up',
     'event.beoremote_one_55555555_44444444_control_wind',
     'event.beoremote_one_55555555_44444444_control_yellow',
-    'event.beoremote_one_55555555_44444444_control_function_1',
-    'event.beoremote_one_55555555_44444444_control_function_2',
-    'event.beoremote_one_55555555_44444444_control_function_3',
-    'event.beoremote_one_55555555_44444444_control_function_4',
-    'event.beoremote_one_55555555_44444444_control_function_5',
-    'event.beoremote_one_55555555_44444444_control_function_6',
-    'event.beoremote_one_55555555_44444444_control_function_7',
-    'event.beoremote_one_55555555_44444444_control_function_8',
-    'event.beoremote_one_55555555_44444444_control_function_9',
-    'event.beoremote_one_55555555_44444444_control_function_10',
-    'event.beoremote_one_55555555_44444444_control_function_11',
-    'event.beoremote_one_55555555_44444444_control_function_12',
-    'event.beoremote_one_55555555_44444444_control_function_13',
-    'event.beoremote_one_55555555_44444444_control_function_14',
-    'event.beoremote_one_55555555_44444444_control_function_15',
-    'event.beoremote_one_55555555_44444444_control_function_16',
-    'event.beoremote_one_55555555_44444444_control_function_17',
-    'event.beoremote_one_55555555_44444444_control_function_18',
-    'event.beoremote_one_55555555_44444444_control_function_19',
-    'event.beoremote_one_55555555_44444444_control_function_20',
-    'event.beoremote_one_55555555_44444444_control_function_21',
-    'event.beoremote_one_55555555_44444444_control_function_22',
-    'event.beoremote_one_55555555_44444444_control_function_23',
-    'event.beoremote_one_55555555_44444444_control_function_24',
-    'event.beoremote_one_55555555_44444444_control_function_25',
-    'event.beoremote_one_55555555_44444444_control_function_26',
-    'event.beoremote_one_55555555_44444444_control_function_27',
-    'sensor.beosound_a5_44444444_battery',
-    'sensor.beoremote_one_55555555_44444444_battery',
+    'event.beoremote_one_55555555_44444444_light_blue',
+    'event.beoremote_one_55555555_44444444_light_digit_0',
+    'event.beoremote_one_55555555_44444444_light_digit_1',
+    'event.beoremote_one_55555555_44444444_light_digit_2',
+    'event.beoremote_one_55555555_44444444_light_digit_3',
+    'event.beoremote_one_55555555_44444444_light_digit_4',
+    'event.beoremote_one_55555555_44444444_light_digit_5',
+    'event.beoremote_one_55555555_44444444_light_digit_6',
+    'event.beoremote_one_55555555_44444444_light_digit_7',
+    'event.beoremote_one_55555555_44444444_light_digit_8',
+    'event.beoremote_one_55555555_44444444_light_digit_9',
+    'event.beoremote_one_55555555_44444444_light_down',
+    'event.beoremote_one_55555555_44444444_light_function_1',
+    'event.beoremote_one_55555555_44444444_light_function_10',
+    'event.beoremote_one_55555555_44444444_light_function_11',
+    'event.beoremote_one_55555555_44444444_light_function_12',
+    'event.beoremote_one_55555555_44444444_light_function_13',
+    'event.beoremote_one_55555555_44444444_light_function_14',
+    'event.beoremote_one_55555555_44444444_light_function_15',
+    'event.beoremote_one_55555555_44444444_light_function_16',
+    'event.beoremote_one_55555555_44444444_light_function_17',
+    'event.beoremote_one_55555555_44444444_light_function_2',
+    'event.beoremote_one_55555555_44444444_light_function_3',
+    'event.beoremote_one_55555555_44444444_light_function_4',
+    'event.beoremote_one_55555555_44444444_light_function_5',
+    'event.beoremote_one_55555555_44444444_light_function_6',
+    'event.beoremote_one_55555555_44444444_light_function_7',
+    'event.beoremote_one_55555555_44444444_light_function_8',
+    'event.beoremote_one_55555555_44444444_light_function_9',
+    'event.beoremote_one_55555555_44444444_light_green',
+    'event.beoremote_one_55555555_44444444_light_left',
+    'event.beoremote_one_55555555_44444444_light_play',
+    'event.beoremote_one_55555555_44444444_light_red',
+    'event.beoremote_one_55555555_44444444_light_rewind',
+    'event.beoremote_one_55555555_44444444_light_right',
+    'event.beoremote_one_55555555_44444444_light_select',
+    'event.beoremote_one_55555555_44444444_light_stop',
+    'event.beoremote_one_55555555_44444444_light_up',
+    'event.beoremote_one_55555555_44444444_light_wind',
+    'event.beoremote_one_55555555_44444444_light_yellow',
+    'event.beosound_a5_44444444_bluetooth',
+    'event.beosound_a5_44444444_favorite_1',
+    'event.beosound_a5_44444444_favorite_2',
+    'event.beosound_a5_44444444_favorite_3',
+    'event.beosound_a5_44444444_favorite_4',
+    'event.beosound_a5_44444444_next',
+    'event.beosound_a5_44444444_play_pause',
+    'event.beosound_a5_44444444_previous',
+    'event.beosound_a5_44444444_volume',
     'media_player.beosound_a5_44444444',
+    'sensor.beoremote_one_55555555_44444444_battery',
+    'sensor.beosound_a5_44444444_battery',
   ])
 # ---
 # name: test_button_event_creation_balance
   list([
-    'event.beosound_balance_11111111_bluetooth',
-    'event.beosound_balance_11111111_microphone',
-    'event.beosound_balance_11111111_next',
-    'event.beosound_balance_11111111_play_pause',
-    'event.beosound_balance_11111111_favorite_1',
-    'event.beosound_balance_11111111_favorite_2',
-    'event.beosound_balance_11111111_favorite_3',
-    'event.beosound_balance_11111111_favorite_4',
-    'event.beosound_balance_11111111_previous',
-    'event.beosound_balance_11111111_volume',
-    'event.beoremote_one_55555555_11111111_light_blue',
-    'event.beoremote_one_55555555_11111111_light_digit_0',
-    'event.beoremote_one_55555555_11111111_light_digit_1',
-    'event.beoremote_one_55555555_11111111_light_digit_2',
-    'event.beoremote_one_55555555_11111111_light_digit_3',
-    'event.beoremote_one_55555555_11111111_light_digit_4',
-    'event.beoremote_one_55555555_11111111_light_digit_5',
-    'event.beoremote_one_55555555_11111111_light_digit_6',
-    'event.beoremote_one_55555555_11111111_light_digit_7',
-    'event.beoremote_one_55555555_11111111_light_digit_8',
-    'event.beoremote_one_55555555_11111111_light_digit_9',
-    'event.beoremote_one_55555555_11111111_light_down',
-    'event.beoremote_one_55555555_11111111_light_green',
-    'event.beoremote_one_55555555_11111111_light_left',
-    'event.beoremote_one_55555555_11111111_light_play',
-    'event.beoremote_one_55555555_11111111_light_red',
-    'event.beoremote_one_55555555_11111111_light_rewind',
-    'event.beoremote_one_55555555_11111111_light_right',
-    'event.beoremote_one_55555555_11111111_light_select',
-    'event.beoremote_one_55555555_11111111_light_stop',
-    'event.beoremote_one_55555555_11111111_light_up',
-    'event.beoremote_one_55555555_11111111_light_wind',
-    'event.beoremote_one_55555555_11111111_light_yellow',
-    'event.beoremote_one_55555555_11111111_light_function_1',
-    'event.beoremote_one_55555555_11111111_light_function_2',
-    'event.beoremote_one_55555555_11111111_light_function_3',
-    'event.beoremote_one_55555555_11111111_light_function_4',
-    'event.beoremote_one_55555555_11111111_light_function_5',
-    'event.beoremote_one_55555555_11111111_light_function_6',
-    'event.beoremote_one_55555555_11111111_light_function_7',
-    'event.beoremote_one_55555555_11111111_light_function_8',
-    'event.beoremote_one_55555555_11111111_light_function_9',
-    'event.beoremote_one_55555555_11111111_light_function_10',
-    'event.beoremote_one_55555555_11111111_light_function_11',
-    'event.beoremote_one_55555555_11111111_light_function_12',
-    'event.beoremote_one_55555555_11111111_light_function_13',
-    'event.beoremote_one_55555555_11111111_light_function_14',
-    'event.beoremote_one_55555555_11111111_light_function_15',
-    'event.beoremote_one_55555555_11111111_light_function_16',
-    'event.beoremote_one_55555555_11111111_light_function_17',
     'event.beoremote_one_55555555_11111111_control_blue',
     'event.beoremote_one_55555555_11111111_control_digit_0',
     'event.beoremote_one_55555555_11111111_control_digit_1',
@@ -170,6 +120,33 @@
     'event.beoremote_one_55555555_11111111_control_digit_8',
     'event.beoremote_one_55555555_11111111_control_digit_9',
     'event.beoremote_one_55555555_11111111_control_down',
+    'event.beoremote_one_55555555_11111111_control_function_1',
+    'event.beoremote_one_55555555_11111111_control_function_10',
+    'event.beoremote_one_55555555_11111111_control_function_11',
+    'event.beoremote_one_55555555_11111111_control_function_12',
+    'event.beoremote_one_55555555_11111111_control_function_13',
+    'event.beoremote_one_55555555_11111111_control_function_14',
+    'event.beoremote_one_55555555_11111111_control_function_15',
+    'event.beoremote_one_55555555_11111111_control_function_16',
+    'event.beoremote_one_55555555_11111111_control_function_17',
+    'event.beoremote_one_55555555_11111111_control_function_18',
+    'event.beoremote_one_55555555_11111111_control_function_19',
+    'event.beoremote_one_55555555_11111111_control_function_2',
+    'event.beoremote_one_55555555_11111111_control_function_20',
+    'event.beoremote_one_55555555_11111111_control_function_21',
+    'event.beoremote_one_55555555_11111111_control_function_22',
+    'event.beoremote_one_55555555_11111111_control_function_23',
+    'event.beoremote_one_55555555_11111111_control_function_24',
+    'event.beoremote_one_55555555_11111111_control_function_25',
+    'event.beoremote_one_55555555_11111111_control_function_26',
+    'event.beoremote_one_55555555_11111111_control_function_27',
+    'event.beoremote_one_55555555_11111111_control_function_3',
+    'event.beoremote_one_55555555_11111111_control_function_4',
+    'event.beoremote_one_55555555_11111111_control_function_5',
+    'event.beoremote_one_55555555_11111111_control_function_6',
+    'event.beoremote_one_55555555_11111111_control_function_7',
+    'event.beoremote_one_55555555_11111111_control_function_8',
+    'event.beoremote_one_55555555_11111111_control_function_9',
     'event.beoremote_one_55555555_11111111_control_green',
     'event.beoremote_one_55555555_11111111_control_left',
     'event.beoremote_one_55555555_11111111_control_play',
@@ -181,87 +158,62 @@
     'event.beoremote_one_55555555_11111111_control_up',
     'event.beoremote_one_55555555_11111111_control_wind',
     'event.beoremote_one_55555555_11111111_control_yellow',
-    'event.beoremote_one_55555555_11111111_control_function_1',
-    'event.beoremote_one_55555555_11111111_control_function_2',
-    'event.beoremote_one_55555555_11111111_control_function_3',
-    'event.beoremote_one_55555555_11111111_control_function_4',
-    'event.beoremote_one_55555555_11111111_control_function_5',
-    'event.beoremote_one_55555555_11111111_control_function_6',
-    'event.beoremote_one_55555555_11111111_control_function_7',
-    'event.beoremote_one_55555555_11111111_control_function_8',
-    'event.beoremote_one_55555555_11111111_control_function_9',
-    'event.beoremote_one_55555555_11111111_control_function_10',
-    'event.beoremote_one_55555555_11111111_control_function_11',
-    'event.beoremote_one_55555555_11111111_control_function_12',
-    'event.beoremote_one_55555555_11111111_control_function_13',
-    'event.beoremote_one_55555555_11111111_control_function_14',
-    'event.beoremote_one_55555555_11111111_control_function_15',
-    'event.beoremote_one_55555555_11111111_control_function_16',
-    'event.beoremote_one_55555555_11111111_control_function_17',
-    'event.beoremote_one_55555555_11111111_control_function_18',
-    'event.beoremote_one_55555555_11111111_control_function_19',
-    'event.beoremote_one_55555555_11111111_control_function_20',
-    'event.beoremote_one_55555555_11111111_control_function_21',
-    'event.beoremote_one_55555555_11111111_control_function_22',
-    'event.beoremote_one_55555555_11111111_control_function_23',
-    'event.beoremote_one_55555555_11111111_control_function_24',
-    'event.beoremote_one_55555555_11111111_control_function_25',
-    'event.beoremote_one_55555555_11111111_control_function_26',
-    'event.beoremote_one_55555555_11111111_control_function_27',
-    'sensor.beoremote_one_55555555_11111111_battery',
+    'event.beoremote_one_55555555_11111111_light_blue',
+    'event.beoremote_one_55555555_11111111_light_digit_0',
+    'event.beoremote_one_55555555_11111111_light_digit_1',
+    'event.beoremote_one_55555555_11111111_light_digit_2',
+    'event.beoremote_one_55555555_11111111_light_digit_3',
+    'event.beoremote_one_55555555_11111111_light_digit_4',
+    'event.beoremote_one_55555555_11111111_light_digit_5',
+    'event.beoremote_one_55555555_11111111_light_digit_6',
+    'event.beoremote_one_55555555_11111111_light_digit_7',
+    'event.beoremote_one_55555555_11111111_light_digit_8',
+    'event.beoremote_one_55555555_11111111_light_digit_9',
+    'event.beoremote_one_55555555_11111111_light_down',
+    'event.beoremote_one_55555555_11111111_light_function_1',
+    'event.beoremote_one_55555555_11111111_light_function_10',
+    'event.beoremote_one_55555555_11111111_light_function_11',
+    'event.beoremote_one_55555555_11111111_light_function_12',
+    'event.beoremote_one_55555555_11111111_light_function_13',
+    'event.beoremote_one_55555555_11111111_light_function_14',
+    'event.beoremote_one_55555555_11111111_light_function_15',
+    'event.beoremote_one_55555555_11111111_light_function_16',
+    'event.beoremote_one_55555555_11111111_light_function_17',
+    'event.beoremote_one_55555555_11111111_light_function_2',
+    'event.beoremote_one_55555555_11111111_light_function_3',
+    'event.beoremote_one_55555555_11111111_light_function_4',
+    'event.beoremote_one_55555555_11111111_light_function_5',
+    'event.beoremote_one_55555555_11111111_light_function_6',
+    'event.beoremote_one_55555555_11111111_light_function_7',
+    'event.beoremote_one_55555555_11111111_light_function_8',
+    'event.beoremote_one_55555555_11111111_light_function_9',
+    'event.beoremote_one_55555555_11111111_light_green',
+    'event.beoremote_one_55555555_11111111_light_left',
+    'event.beoremote_one_55555555_11111111_light_play',
+    'event.beoremote_one_55555555_11111111_light_red',
+    'event.beoremote_one_55555555_11111111_light_rewind',
+    'event.beoremote_one_55555555_11111111_light_right',
+    'event.beoremote_one_55555555_11111111_light_select',
+    'event.beoremote_one_55555555_11111111_light_stop',
+    'event.beoremote_one_55555555_11111111_light_up',
+    'event.beoremote_one_55555555_11111111_light_wind',
+    'event.beoremote_one_55555555_11111111_light_yellow',
+    'event.beosound_balance_11111111_bluetooth',
+    'event.beosound_balance_11111111_favorite_1',
+    'event.beosound_balance_11111111_favorite_2',
+    'event.beosound_balance_11111111_favorite_3',
+    'event.beosound_balance_11111111_favorite_4',
+    'event.beosound_balance_11111111_microphone',
+    'event.beosound_balance_11111111_next',
+    'event.beosound_balance_11111111_play_pause',
+    'event.beosound_balance_11111111_previous',
+    'event.beosound_balance_11111111_volume',
     'media_player.beosound_balance_11111111',
+    'sensor.beoremote_one_55555555_11111111_battery',
   ])
 # ---
 # name: test_button_event_creation_premiere
   list([
-    'event.beosound_premiere_33333333_next',
-    'event.beosound_premiere_33333333_play_pause',
-    'event.beosound_premiere_33333333_favorite_1',
-    'event.beosound_premiere_33333333_favorite_2',
-    'event.beosound_premiere_33333333_favorite_3',
-    'event.beosound_premiere_33333333_favorite_4',
-    'event.beosound_premiere_33333333_previous',
-    'event.beosound_premiere_33333333_volume',
-    'event.beoremote_one_55555555_33333333_light_blue',
-    'event.beoremote_one_55555555_33333333_light_digit_0',
-    'event.beoremote_one_55555555_33333333_light_digit_1',
-    'event.beoremote_one_55555555_33333333_light_digit_2',
-    'event.beoremote_one_55555555_33333333_light_digit_3',
-    'event.beoremote_one_55555555_33333333_light_digit_4',
-    'event.beoremote_one_55555555_33333333_light_digit_5',
-    'event.beoremote_one_55555555_33333333_light_digit_6',
-    'event.beoremote_one_55555555_33333333_light_digit_7',
-    'event.beoremote_one_55555555_33333333_light_digit_8',
-    'event.beoremote_one_55555555_33333333_light_digit_9',
-    'event.beoremote_one_55555555_33333333_light_down',
-    'event.beoremote_one_55555555_33333333_light_green',
-    'event.beoremote_one_55555555_33333333_light_left',
-    'event.beoremote_one_55555555_33333333_light_play',
-    'event.beoremote_one_55555555_33333333_light_red',
-    'event.beoremote_one_55555555_33333333_light_rewind',
-    'event.beoremote_one_55555555_33333333_light_right',
-    'event.beoremote_one_55555555_33333333_light_select',
-    'event.beoremote_one_55555555_33333333_light_stop',
-    'event.beoremote_one_55555555_33333333_light_up',
-    'event.beoremote_one_55555555_33333333_light_wind',
-    'event.beoremote_one_55555555_33333333_light_yellow',
-    'event.beoremote_one_55555555_33333333_light_function_1',
-    'event.beoremote_one_55555555_33333333_light_function_2',
-    'event.beoremote_one_55555555_33333333_light_function_3',
-    'event.beoremote_one_55555555_33333333_light_function_4',
-    'event.beoremote_one_55555555_33333333_light_function_5',
-    'event.beoremote_one_55555555_33333333_light_function_6',
-    'event.beoremote_one_55555555_33333333_light_function_7',
-    'event.beoremote_one_55555555_33333333_light_function_8',
-    'event.beoremote_one_55555555_33333333_light_function_9',
-    'event.beoremote_one_55555555_33333333_light_function_10',
-    'event.beoremote_one_55555555_33333333_light_function_11',
-    'event.beoremote_one_55555555_33333333_light_function_12',
-    'event.beoremote_one_55555555_33333333_light_function_13',
-    'event.beoremote_one_55555555_33333333_light_function_14',
-    'event.beoremote_one_55555555_33333333_light_function_15',
-    'event.beoremote_one_55555555_33333333_light_function_16',
-    'event.beoremote_one_55555555_33333333_light_function_17',
     'event.beoremote_one_55555555_33333333_control_blue',
     'event.beoremote_one_55555555_33333333_control_digit_0',
     'event.beoremote_one_55555555_33333333_control_digit_1',
@@ -274,6 +226,33 @@
     'event.beoremote_one_55555555_33333333_control_digit_8',
     'event.beoremote_one_55555555_33333333_control_digit_9',
     'event.beoremote_one_55555555_33333333_control_down',
+    'event.beoremote_one_55555555_33333333_control_function_1',
+    'event.beoremote_one_55555555_33333333_control_function_10',
+    'event.beoremote_one_55555555_33333333_control_function_11',
+    'event.beoremote_one_55555555_33333333_control_function_12',
+    'event.beoremote_one_55555555_33333333_control_function_13',
+    'event.beoremote_one_55555555_33333333_control_function_14',
+    'event.beoremote_one_55555555_33333333_control_function_15',
+    'event.beoremote_one_55555555_33333333_control_function_16',
+    'event.beoremote_one_55555555_33333333_control_function_17',
+    'event.beoremote_one_55555555_33333333_control_function_18',
+    'event.beoremote_one_55555555_33333333_control_function_19',
+    'event.beoremote_one_55555555_33333333_control_function_2',
+    'event.beoremote_one_55555555_33333333_control_function_20',
+    'event.beoremote_one_55555555_33333333_control_function_21',
+    'event.beoremote_one_55555555_33333333_control_function_22',
+    'event.beoremote_one_55555555_33333333_control_function_23',
+    'event.beoremote_one_55555555_33333333_control_function_24',
+    'event.beoremote_one_55555555_33333333_control_function_25',
+    'event.beoremote_one_55555555_33333333_control_function_26',
+    'event.beoremote_one_55555555_33333333_control_function_27',
+    'event.beoremote_one_55555555_33333333_control_function_3',
+    'event.beoremote_one_55555555_33333333_control_function_4',
+    'event.beoremote_one_55555555_33333333_control_function_5',
+    'event.beoremote_one_55555555_33333333_control_function_6',
+    'event.beoremote_one_55555555_33333333_control_function_7',
+    'event.beoremote_one_55555555_33333333_control_function_8',
+    'event.beoremote_one_55555555_33333333_control_function_9',
     'event.beoremote_one_55555555_33333333_control_green',
     'event.beoremote_one_55555555_33333333_control_left',
     'event.beoremote_one_55555555_33333333_control_play',
@@ -285,35 +264,56 @@
     'event.beoremote_one_55555555_33333333_control_up',
     'event.beoremote_one_55555555_33333333_control_wind',
     'event.beoremote_one_55555555_33333333_control_yellow',
-    'event.beoremote_one_55555555_33333333_control_function_1',
-    'event.beoremote_one_55555555_33333333_control_function_2',
-    'event.beoremote_one_55555555_33333333_control_function_3',
-    'event.beoremote_one_55555555_33333333_control_function_4',
-    'event.beoremote_one_55555555_33333333_control_function_5',
-    'event.beoremote_one_55555555_33333333_control_function_6',
-    'event.beoremote_one_55555555_33333333_control_function_7',
-    'event.beoremote_one_55555555_33333333_control_function_8',
-    'event.beoremote_one_55555555_33333333_control_function_9',
-    'event.beoremote_one_55555555_33333333_control_function_10',
-    'event.beoremote_one_55555555_33333333_control_function_11',
-    'event.beoremote_one_55555555_33333333_control_function_12',
-    'event.beoremote_one_55555555_33333333_control_function_13',
-    'event.beoremote_one_55555555_33333333_control_function_14',
-    'event.beoremote_one_55555555_33333333_control_function_15',
-    'event.beoremote_one_55555555_33333333_control_function_16',
-    'event.beoremote_one_55555555_33333333_control_function_17',
-    'event.beoremote_one_55555555_33333333_control_function_18',
-    'event.beoremote_one_55555555_33333333_control_function_19',
-    'event.beoremote_one_55555555_33333333_control_function_20',
-    'event.beoremote_one_55555555_33333333_control_function_21',
-    'event.beoremote_one_55555555_33333333_control_function_22',
-    'event.beoremote_one_55555555_33333333_control_function_23',
-    'event.beoremote_one_55555555_33333333_control_function_24',
-    'event.beoremote_one_55555555_33333333_control_function_25',
-    'event.beoremote_one_55555555_33333333_control_function_26',
-    'event.beoremote_one_55555555_33333333_control_function_27',
-    'sensor.beoremote_one_55555555_33333333_battery',
+    'event.beoremote_one_55555555_33333333_light_blue',
+    'event.beoremote_one_55555555_33333333_light_digit_0',
+    'event.beoremote_one_55555555_33333333_light_digit_1',
+    'event.beoremote_one_55555555_33333333_light_digit_2',
+    'event.beoremote_one_55555555_33333333_light_digit_3',
+    'event.beoremote_one_55555555_33333333_light_digit_4',
+    'event.beoremote_one_55555555_33333333_light_digit_5',
+    'event.beoremote_one_55555555_33333333_light_digit_6',
+    'event.beoremote_one_55555555_33333333_light_digit_7',
+    'event.beoremote_one_55555555_33333333_light_digit_8',
+    'event.beoremote_one_55555555_33333333_light_digit_9',
+    'event.beoremote_one_55555555_33333333_light_down',
+    'event.beoremote_one_55555555_33333333_light_function_1',
+    'event.beoremote_one_55555555_33333333_light_function_10',
+    'event.beoremote_one_55555555_33333333_light_function_11',
+    'event.beoremote_one_55555555_33333333_light_function_12',
+    'event.beoremote_one_55555555_33333333_light_function_13',
+    'event.beoremote_one_55555555_33333333_light_function_14',
+    'event.beoremote_one_55555555_33333333_light_function_15',
+    'event.beoremote_one_55555555_33333333_light_function_16',
+    'event.beoremote_one_55555555_33333333_light_function_17',
+    'event.beoremote_one_55555555_33333333_light_function_2',
+    'event.beoremote_one_55555555_33333333_light_function_3',
+    'event.beoremote_one_55555555_33333333_light_function_4',
+    'event.beoremote_one_55555555_33333333_light_function_5',
+    'event.beoremote_one_55555555_33333333_light_function_6',
+    'event.beoremote_one_55555555_33333333_light_function_7',
+    'event.beoremote_one_55555555_33333333_light_function_8',
+    'event.beoremote_one_55555555_33333333_light_function_9',
+    'event.beoremote_one_55555555_33333333_light_green',
+    'event.beoremote_one_55555555_33333333_light_left',
+    'event.beoremote_one_55555555_33333333_light_play',
+    'event.beoremote_one_55555555_33333333_light_red',
+    'event.beoremote_one_55555555_33333333_light_rewind',
+    'event.beoremote_one_55555555_33333333_light_right',
+    'event.beoremote_one_55555555_33333333_light_select',
+    'event.beoremote_one_55555555_33333333_light_stop',
+    'event.beoremote_one_55555555_33333333_light_up',
+    'event.beoremote_one_55555555_33333333_light_wind',
+    'event.beoremote_one_55555555_33333333_light_yellow',
+    'event.beosound_premiere_33333333_favorite_1',
+    'event.beosound_premiere_33333333_favorite_2',
+    'event.beosound_premiere_33333333_favorite_3',
+    'event.beosound_premiere_33333333_favorite_4',
+    'event.beosound_premiere_33333333_next',
+    'event.beosound_premiere_33333333_play_pause',
+    'event.beosound_premiere_33333333_previous',
+    'event.beosound_premiere_33333333_volume',
     'media_player.beosound_premiere_33333333',
+    'sensor.beoremote_one_55555555_33333333_battery',
   ])
 # ---
 # name: test_no_button_and_remote_key_event_creation_core
diff --git a/tests/components/bang_olufsen/test_event.py b/tests/components/bang_olufsen/test_event.py
index c228efb0d11..7253cace0ec 100644
--- a/tests/components/bang_olufsen/test_event.py
+++ b/tests/components/bang_olufsen/test_event.py
@@ -57,7 +57,7 @@ async def _check_button_event_creation(
     entity_ids_available = list(entity_registry.entities.keys())
 
     assert entity_ids_available == unordered(entity_ids)
-    assert entity_ids_available == snapshot
+    assert sorted(entity_ids_available) == snapshot
 
 
 async def test_button_event_creation_balance(