Clean up Entity helper test code

tests/test_helper_entity.py

@@ -20,15 +20,15 @@ class TestHelpersEntity(unittest.TestCase):
         self.entity = entity.Entity()
         self.entity.entity_id = 'test.overwrite_hidden_true'
         self.hass = self.entity.hass = ha.HomeAssistant()
+        self.entity.update_ha_state()
 
     def tearDown(self):  # pylint: disable=invalid-name
         """ Stop down stuff we started. """
         self.hass.stop()
+        entity.Entity.overwrite_hidden(self.entity.entity_id, None)
 
     def test_default_hidden_not_in_attributes(self):
         """ Test that the default hidden property is set to False. """
-        self.entity.update_ha_state()
-
         self.assertNotIn(
             ATTR_HIDDEN,
             self.hass.states.get(self.entity.entity_id).attributes)
@@ -41,29 +41,20 @@ class TestHelpersEntity(unittest.TestCase):
 
         self.assertTrue(state.attributes.get(ATTR_HIDDEN))
 
-        self.entity.hidden = False
-
     def test_overwriting_hidden_property_to_true(self):
         """ Test we can overwrite hidden property to True. """
         entity.Entity.overwrite_hidden(self.entity.entity_id, True)
-
         self.entity.update_ha_state()
 
         state = self.hass.states.get(self.entity.entity_id)
-
         self.assertTrue(state.attributes.get(ATTR_HIDDEN))
 
-        entity.Entity.overwrite_hidden(self.entity.entity_id, None)
-
     def test_overwriting_hidden_property_to_false(self):
         """ Test we can overwrite hidden property to True. """
         entity.Entity.overwrite_hidden(self.entity.entity_id, False)
-
         self.entity.hidden = True
         self.entity.update_ha_state()
 
         self.assertNotIn(
             ATTR_HIDDEN,
             self.hass.states.get(self.entity.entity_id).attributes)
-
-        entity.Entity.overwrite_hidden(self.entity.entity_id, None)