diff --git a/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy b/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy
index ed7821b8c..1b77a40d9 100644
--- a/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy
+++ b/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy
@@ -1991,7 +1991,7 @@ class MetacatSmokeSpec extends Specification {
 
         // Second parent child connected component
         def parent2 = "parent2"
-        def parent2UUID = "parent2_uuid"
+        def parent2UUID = "p2_uuid"
         def parent2Uri = isLocalEnv ? String.format('file:/tmp/%s/%s', databaseName, parent2) : null
         def parent2FullName = catalogName + "." + databaseName + "." + parent2
         def child21 = "child21"
diff --git a/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy b/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy
index 526a62199..bcdb7f0e8 100644
--- a/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy
+++ b/metacat-functional-tests/src/functionalTest/groovy/com/netflix/metacat/ParentChildRelMetadataServiceSpec.groovy
@@ -420,7 +420,7 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         assert service.getParents(child, Optional.of(childUUID)) == child_parent_expected
         assert service.getParents(child, Optional.empty()) == child_parent_expected
         assert service.getChildren(child, Optional.of(childUUID)).isEmpty()
-        assert service.getParents(child, Optional.empty()).isEmpty()
+        assert service.getChildren(child, Optional.empty()).isEmpty()
 
         when:
         service.rename(parent, newParent, Optional.of(parentUUID))
@@ -446,7 +446,7 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         assert service.getParents(child, Optional.of(childUUID)) == child_parent_expected
         assert service.getParents(child, Optional.empty()) == child_parent_expected
         assert service.getChildren(child, Optional.of(childUUID)).isEmpty()
-        assert service.getParents(child, Optional.empty()).isEmpty()
+        assert service.getChildren(child, Optional.empty()).isEmpty()
 
         // delete the record with parentUUID2
         when:
@@ -469,7 +469,7 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         assert service.getParents(child, Optional.of(childUUID)).isEmpty()
         assert service.getParents(child, Optional.empty()).isEmpty()
         assert service.getChildren(child, Optional.of(childUUID)).isEmpty()
-        assert service.getParents(child, Optional.empty()).isEmpty()
+        assert service.getChildren(child, Optional.empty()).isEmpty()
     }
 
     def "Test CreateThenRenameThenDeleteWithNoIDSpecified- two same parent name but different id"() {
@@ -524,11 +524,11 @@ class ParentChildRelMetadataServiceSpec extends Specification{
         assert service.getChildren(newParent, Optional.empty()) == parent_children_expected
 
         // Test Parent with UUID2
-        assert service.getParents(parent, Optional.of(parentUUID2)).isEmpty()
-        assert service.getParents(parent, Optional.empty()).isEmpty()
+        assert service.getParents(newParent, Optional.of(parentUUID2)).isEmpty()
+        assert service.getParents(newParent, Optional.empty()).isEmpty()
 
-        assert service.getChildren(parent, Optional.of(parentUUID2)) == parent_children_expected
-        assert service.getChildren(parent, Optional.empty()) == parent_children_expected
+        assert service.getChildren(newParent, Optional.of(parentUUID2)) == parent_children_expected
+        assert service.getChildren(newParent, Optional.empty()) == parent_children_expected
 
         // Test Child
         assert service.getParents(child, Optional.of(childUUID)) == child_parent_expected