Simple switch with timer (and v2): undo previous changes to test.

The device class was removed, as this device should cover all classes.
So the recent change to tests to include device_class in entity id can
be reverted.  Also removed device_class tests.

tests/devices/test_simple_switch_with_timer.py

@@ -16,7 +16,7 @@ class TestTimedSwitch(BasicNumberTests, SwitchableTests, TuyaDeviceTestCase):
 
     def setUp(self):
         self.setUpForConfig("simple_switch_timer.yaml", TIMED_SOCKET_PAYLOAD)
-        self.subject = self.entities.get("switch_outlet")
+        self.subject = self.entities.get("switch")
         self.setUpSwitchable(SWITCH_DPS, self.subject)
         self.setUpBasicNumber(
             TIMER_DPS,
@@ -27,9 +27,6 @@ class TestTimedSwitch(BasicNumberTests, SwitchableTests, TuyaDeviceTestCase):
         )
         self.mark_secondary(["number_timer"])
 
-    def test_device_class_is_outlet(self):
-        self.assertEqual(self.subject.device_class, SwitchDeviceClass.OUTLET)
-
     def test_extra_state_attributes_set(self):
         self.assertDictEqual(
             self.subject.extra_state_attributes,

tests/devices/test_simple_switch_with_timerv2.py

@@ -16,7 +16,7 @@ class TestTimedSwitch(BasicNumberTests, SwitchableTests, TuyaDeviceTestCase):
 
     def setUp(self):
         self.setUpForConfig("simple_switch_timerv2.yaml", TIMED_SOCKETV2_PAYLOAD)
-        self.subject = self.entities.get("switch_outlet")
+        self.subject = self.entities.get("switch")
         self.setUpSwitchable(SWITCH_DPS, self.subject)
         self.setUpBasicNumber(
             TIMER_DPS,
@@ -27,9 +27,6 @@ class TestTimedSwitch(BasicNumberTests, SwitchableTests, TuyaDeviceTestCase):
         )
         self.mark_secondary(["number_timer", "select_power_on_state"])
 
-    def test_device_class_is_outlet(self):
-        self.assertEqual(self.subject.device_class, SwitchDeviceClass.OUTLET)
-
     def test_extra_state_attributes_set(self):
         self.assertDictEqual(
             self.subject.extra_state_attributes,