diff --git a/zaza/openstack/charm_tests/aodh/tests.py b/zaza/openstack/charm_tests/aodh/tests.py
index f43615f..a8c7ee8 100644
--- a/zaza/openstack/charm_tests/aodh/tests.py
+++ b/zaza/openstack/charm_tests/aodh/tests.py
@@ -111,7 +111,7 @@ class AodhTest(test_utils.OpenStackBaseTest):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
diff --git a/zaza/openstack/charm_tests/ceilometer/tests.py b/zaza/openstack/charm_tests/ceilometer/tests.py
index a7f2618..53c3594 100644
--- a/zaza/openstack/charm_tests/ceilometer/tests.py
+++ b/zaza/openstack/charm_tests/ceilometer/tests.py
@@ -34,7 +34,6 @@ class CeilometerTest(test_utils.OpenStackBaseTest):
     XENIAL_NEWTON = openstack_utils.get_os_release('xenial_newton')
     XENIAL_MITAKA = openstack_utils.get_os_release('xenial_mitaka')
     TRUSTY_MITAKA = openstack_utils.get_os_release('trusty_mitaka')
-    TRUSTY_LIBERTY = openstack_utils.get_os_release('trusty_liberty')
 
     @classmethod
     def setUpClass(cls):
@@ -44,7 +43,7 @@ class CeilometerTest(test_utils.OpenStackBaseTest):
 
     @property
     def services(self):
-        """Return a list of services for Openstack Release."""
+        """Return a list of services for the selected Openstack release."""
         services = []
 
         if self.application_name == 'ceilometer-agent':
@@ -81,21 +80,14 @@ class CeilometerTest(test_utils.OpenStackBaseTest):
                 services.append('ceilometer-alarm-notifier')
                 services.append('ceilometer-alarm-evaluator')
 
-            # if self.current_release >= CeilometerTest.TRUSTY_LIBERTY:
-                # Liberty and later
-                # services.append('ceilometer-polling')
-            # else:
-                # Juno and earlier
-                # services.append('ceilometer-agent-central')
-
         return services
 
     @property
     def restartable_services(self):
         """Return a list of services that are known to be restartable.
 
-        For Openstack Release these services are known to be able to be stopped
-        and started with no issues.
+        For the selected Openstack release these services are known to be able
+        to be stopped and started with no issues.
         """
         # Due to Bug #1861321 ceilometer-collector does not reliably
         # restart.
diff --git a/zaza/openstack/charm_tests/cinder/tests.py b/zaza/openstack/charm_tests/cinder/tests.py
index 1fa6a30..ea75fe9 100644
--- a/zaza/openstack/charm_tests/cinder/tests.py
+++ b/zaza/openstack/charm_tests/cinder/tests.py
@@ -153,7 +153,7 @@ class CinderTests(test_utils.OpenStackBaseTest):
 
     @property
     def services(self):
-        """Return a list services for OpenStack release."""
+        """Return a list services for the selected Openstack release."""
         services = ['cinder-scheduler', 'cinder-volume']
         if (openstack_utils.get_os_release() >=
                 openstack_utils.get_os_release('xenial_ocata')):
@@ -165,7 +165,7 @@ class CinderTests(test_utils.OpenStackBaseTest):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
@@ -176,7 +176,7 @@ class CinderTests(test_utils.OpenStackBaseTest):
         conf_file = '/etc/cinder/cinder.conf'
 
         # Make config change, check for service restarts
-        logging.debug('Setting disk format glance...')
+        logging.debug('Setting debug mode...')
         self.restart_on_changed(
             conf_file,
             set_default,
diff --git a/zaza/openstack/charm_tests/cinder_backup/tests.py b/zaza/openstack/charm_tests/cinder_backup/tests.py
index 087bbac..ae1ca50 100644
--- a/zaza/openstack/charm_tests/cinder_backup/tests.py
+++ b/zaza/openstack/charm_tests/cinder_backup/tests.py
@@ -40,7 +40,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest):
 
     @property
     def services(self):
-        """Return a list services for Openstack Release."""
+        """Return a list services for the selected Openstack release."""
         current_release = openstack_utils.get_os_release()
         services = ['cinder-scheduler', 'cinder-volume']
         if (current_release >=
diff --git a/zaza/openstack/charm_tests/designate/tests.py b/zaza/openstack/charm_tests/designate/tests.py
index 8e57273..5066dd4 100644
--- a/zaza/openstack/charm_tests/designate/tests.py
+++ b/zaza/openstack/charm_tests/designate/tests.py
@@ -95,7 +95,7 @@ class DesignateTests(BaseDesignateTest):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
diff --git a/zaza/openstack/charm_tests/glance/tests.py b/zaza/openstack/charm_tests/glance/tests.py
index 4f25d81..033ec28 100644
--- a/zaza/openstack/charm_tests/glance/tests.py
+++ b/zaza/openstack/charm_tests/glance/tests.py
@@ -44,7 +44,7 @@ class GlanceTest(test_utils.OpenStackBaseTest):
     def test_411_set_disk_format(self):
         """Change disk format and check.
 
-        Change disk format and assert then change propagates to the correct
+        Change disk format and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
diff --git a/zaza/openstack/charm_tests/gnocchi/tests.py b/zaza/openstack/charm_tests/gnocchi/tests.py
index 6811880..e73bab7 100644
--- a/zaza/openstack/charm_tests/gnocchi/tests.py
+++ b/zaza/openstack/charm_tests/gnocchi/tests.py
@@ -28,7 +28,7 @@ class GnocchiTest(test_utils.OpenStackBaseTest):
 
     @property
     def services(self):
-        """Return a list of services for Openstack Release."""
+        """Return a list of services for the selected Openstack release."""
         return ['haproxy', 'gnocchi-metricd', 'apache2']
 
     def test_200_api_connection(self):
diff --git a/zaza/openstack/charm_tests/heat/tests.py b/zaza/openstack/charm_tests/heat/tests.py
index 040aa02..a0e2a23 100644
--- a/zaza/openstack/charm_tests/heat/tests.py
+++ b/zaza/openstack/charm_tests/heat/tests.py
@@ -54,7 +54,7 @@ class HeatBasicDeployment(test_utils.OpenStackBaseTest):
 
     @property
     def services(self):
-        """Return a list services for OpenStack release.
+        """Return a list services for the selected Openstack release.
 
         :returns: List of services
         :rtype: [str]
diff --git a/zaza/openstack/charm_tests/mysql/tests.py b/zaza/openstack/charm_tests/mysql/tests.py
index a800712..77bc966 100644
--- a/zaza/openstack/charm_tests/mysql/tests.py
+++ b/zaza/openstack/charm_tests/mysql/tests.py
@@ -78,7 +78,7 @@ class MySQLCommonTests(MySQLBaseTest):
     def test_910_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change max connections and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
@@ -86,7 +86,7 @@ class MySQLCommonTests(MySQLBaseTest):
         set_alternate = {"max-connections": "1000"}
 
         # Make config change, check for service restarts
-        logging.debug("Setting peer timeout ...")
+        logging.debug("Setting max connections ...")
         self.restart_on_changed(
             self.conf_file,
             set_default,
diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py
index 2ae92f6..f4519f8 100644
--- a/zaza/openstack/charm_tests/neutron/tests.py
+++ b/zaza/openstack/charm_tests/neutron/tests.py
@@ -113,7 +113,7 @@ class NeutronGatewayTest(NeutronPluginApiSharedTests):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
@@ -285,7 +285,7 @@ class NeutronApiTest(NeutronCreateNetworkTest):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
diff --git a/zaza/openstack/charm_tests/nova/tests.py b/zaza/openstack/charm_tests/nova/tests.py
index f750b5a..2dc9f6e 100644
--- a/zaza/openstack/charm_tests/nova/tests.py
+++ b/zaza/openstack/charm_tests/nova/tests.py
@@ -75,7 +75,7 @@ class NovaCompute(test_utils.OpenStackBaseTest):
     def test_900_restart_on_config_change(self):
         """Checking restart happens on config change.
 
-        Change disk format and assert then change propagates to the correct
+        Change debug mode and assert that change propagates to the correct
         file and that services are restarted as a result
         """
         # Expected default and alternate values
diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index 2abfa62..82fed63 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -259,7 +259,7 @@ class BaseCharmTest(unittest.TestCase):
                            pgrep_full=False):
         """Run restart on change tests.
 
-        Test that changing config results in config file being updates and
+        Test that changing config results in config file being updated and
         services restarted. Return config to default_config afterwards
 
         :param config_file: Config file to check for settings