diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
index b1b954b..d82c72d 100644
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@@ -45,7 +45,7 @@ applications:
       subnet-label: '*'
       verify-cert-path: 'None'
       verify-cert: 'False'
-# Add config options here
+
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index 1f514a6..b3cd106 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -7,17 +7,7 @@ machines:
   '1':
   '2':
   '3':
-relations:
-- - keystone:shared-db
-  - mysql:shared-db
-- - cinder:shared-db
-  - mysql:shared-db
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:storage-backend
-  - cinder-nimblestorage:storage-backend
+
 applications:
   mysql:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -55,9 +45,16 @@ applications:
       subnet-label: '*'
       verify-cert-path: 'None'
       verify-cert: 'False'
-# Add config options here
+  
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     to:
     - '3'
+
+relations:
+  - [ keystone:shared-db, mysql:shared-db ]
+  - [ cinder:shared-db, mysql:shared-db ]
+  - [ cinder:identity-service, keystone:identity-service ]
+  - [ cinder:amqp, rabbitmq-server:amqp ]
+  - [ cinder:storage-backend, cinder-nimblestorage:storage-backend ]
diff --git a/unit_tests/test_cinder_nimblestorage_charm.py b/unit_tests/test_cinder_nimblestorage_charm.py
index f004b30..5239545 100644
--- a/unit_tests/test_cinder_nimblestorage_charm.py
+++ b/unit_tests/test_cinder_nimblestorage_charm.py
@@ -13,15 +13,15 @@
 # limitations under the License.
 
 import unittest
-from src.charm import CinderSolidfireCharm
+from src.charm import CinderNimblestorageCharm
 from ops.model import ActiveStatus
 from ops.testing import Harness
 
 
-class TestCinderSolidfireCharm(unittest.TestCase):
+class TestCinderNimblestorageCharm(unittest.TestCase):
 
     def setUp(self):
-        self.harness = Harness(CinderSolidfireCharm)
+        self.harness = Harness(CinderNimblestorageCharm)
         self.addCleanup(self.harness.cleanup)
         self.harness.begin()
         self.harness.set_leader(True)