diff --git a/test/testcases/acl.exp b/test/testcases/acl.exp
index b90ef53746..6f236d8592 100644
--- a/test/testcases/acl.exp
+++ b/test/testcases/acl.exp
@@ -85,3 +85,5 @@ acl_target bob \
 acl_target cyrus \
 	cyrus-role
 .INP: commit
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
+.EXT crm_resource --show-metadata stonith:null
diff --git a/test/testcases/bugs.exp b/test/testcases/bugs.exp
index 63df1beec7..191a6d3524 100644
--- a/test/testcases/bugs.exp
+++ b/test/testcases/bugs.exp
@@ -39,6 +39,8 @@ primitive p6 Dummy
 clone cl-p5 p5
 colocation c2 inf: ( p1 p2 ) p3 p4
 .INP: commit
+.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
 .INP: _test
 .INP: verify
 .INP: show
@@ -109,6 +111,9 @@ primitive st stonith:null \
 property SAPHanaSR: \
 	hana_ha1_site_lss_WDF1=4
 .INP: commit
+WARNING: 6: c2: resource p1 does not exist
+.EXT crm_resource --show-metadata ocf:heartbeat:Dummy
+WARNING: 6: loc1: resource None does not exist
 .INP: _test
 .INP: verify
 .INP: property SAPHanaSR_2:     hana_ha1_site_iss_WDF1=cde     hana_ha1_site_bss_WDF1=abc
diff --git a/test/testcases/bundle.exp b/test/testcases/bundle.exp
index aa4e6dba3d..9adf1550db 100644
--- a/test/testcases/bundle.exp
+++ b/test/testcases/bundle.exp
@@ -49,3 +49,6 @@ bundle bundle-test2 \
 property cib-bootstrap-options: \
 	stonith-enabled=true
 .INP: commit
+.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
+.EXT crm_resource --show-metadata stonith:null
diff --git a/test/testcases/commit b/test/testcases/commit
index 3f0117c2ad..97a9e48b0c 100644
--- a/test/testcases/commit
+++ b/test/testcases/commit
@@ -34,6 +34,8 @@ filter "sed '/g1/s/p1/d1/'"
 group g2 d3 d2
 delete d2
 commit
+delete d3
+show changed
 _test
 verify
 .
diff --git a/test/testcases/commit.exp b/test/testcases/commit.exp
index 4ebf35f214..8bb7bcb0ce 100644
--- a/test/testcases/commit.exp
+++ b/test/testcases/commit.exp
@@ -8,6 +8,8 @@
 .EXT crm_resource --show-metadata stonith:null
 .EXT stonithd metadata
 .INP: commit
+.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
 WARNING: 7: st: unknown attribute 'yoyo-meta'
 .INP: node node1 	attributes mem=16G
 .INP: primitive p1 ocf:heartbeat:Dummy 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
@@ -44,14 +46,17 @@ INFO: 24: modified colocation:cl1 from c1 to g1
 .INP: group g2 d3 d2
 .INP: delete d2
 .INP: commit
+.INP: delete d3
+.INP: show changed
+primitive d3 Dummy
+group g2
 .INP: _test
 .INP: verify
-WARNING: 35: st: unknown attribute 'yoyo-meta'
+WARNING: 37: st: unknown attribute 'yoyo-meta'
 .INP: show
 node node1 \
 	attributes mem=16G
 primitive d1 Dummy
-primitive d3 Dummy
 primitive p1 Dummy \
 	op monitor interval=60m \
 	op monitor interval=120m \
@@ -63,12 +68,9 @@ primitive st stonith:null \
 	meta yoyo-meta="yoyo 2" requires=nothing \
 	op monitor interval=60m
 group g1 d1 p2
-group g2 d3
 colocation cl1 inf: g1 p3
 location l1 p3 100: node1
 order o1 inf: p3 g1
 op_defaults op-options: \
 	timeout=2m
 .INP: commit
-INFO: 37: apparently there is nothing to commit
-INFO: 37: try changing something first
diff --git a/test/testcases/confbasic.exp b/test/testcases/confbasic.exp
index 74dbeaf77a..98434c9e47 100644
--- a/test/testcases/confbasic.exp
+++ b/test/testcases/confbasic.exp
@@ -147,3 +147,4 @@ op_defaults opsdef2: \
 	record-pending=true
 .INP: commit
 WARNING: 55: c2: resource d1 is grouped, constraints should apply to the group
+.EXT crm_resource --show-metadata stonith:null
diff --git a/test/testcases/delete.exp b/test/testcases/delete.exp
index 11253eb843..450691ffed 100644
--- a/test/testcases/delete.exp
+++ b/test/testcases/delete.exp
@@ -150,3 +150,5 @@ primitive st stonith:ssh \
 .INP: # verify
 .INP: verify
 .INP: commit
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
+.EXT crm_resource --show-metadata stonith:null
diff --git a/test/testcases/edit.exp b/test/testcases/edit.exp
index 0dc5847280..7f384db88f 100644
--- a/test/testcases/edit.exp
+++ b/test/testcases/edit.exp
@@ -168,3 +168,5 @@ rsc_defaults rsc_options: \
 op_defaults op-options: \
 	timeout=60s
 .INP: commit
+.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
diff --git a/test/testcases/newfeatures.exp b/test/testcases/newfeatures.exp
index e172ef9155..8f128b221f 100644
--- a/test/testcases/newfeatures.exp
+++ b/test/testcases/newfeatures.exp
@@ -59,3 +59,6 @@ alert notify_9 "/usr/share/pacemaker/alerts/alert_snmp.sh" \
 .EXT pengine metadata
 .EXT cib metadata
 .INP: commit
+.EXT crm_resource --show-metadata ocf:pacemaker:Dummy
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
+.EXT crm_resource --show-metadata stonith:null
diff --git a/test/testcases/rset.exp b/test/testcases/rset.exp
index e4cd5eb5af..68a9263038 100644
--- a/test/testcases/rset.exp
+++ b/test/testcases/rset.exp
@@ -53,3 +53,5 @@ colocation c2 inf: d3 d1
 colocation c3 inf: d3 d1
 order o1 Serialize: d1 d3
 .INP: commit
+.EXT crm_resource --show-metadata ocf:heartbeat:Delay
+.EXT crm_resource --show-metadata stonith:null