diff --git a/shell/regression/testcases/BSC b/shell/regression/testcases/BSC
index f58d29f92c..32cc3694de 100644
--- a/shell/regression/testcases/BSC
+++ b/shell/regression/testcases/BSC
@@ -1,7 +1,10 @@
 confbasic
 confbasic-xml
 node
 resource
 file
 shadow
 ra
+edit
+commit
+delete
diff --git a/shell/regression/testcases/commit b/shell/regression/testcases/commit
new file mode 100644
index 0000000000..e8111352e7
--- /dev/null
+++ b/shell/regression/testcases/commit
@@ -0,0 +1,40 @@
+show Commits of all kinds
+property default-action-timeout=2m
+primitive st stonith:null \
+	params hostlist='node1' \
+	meta yoyo-meta="yoyo 2" \
+	op start requires=nothing \
+	op monitor interval=60m
+commit
+node node1 \
+	attributes mem=16G
+primitive p1 ocf:heartbeat:Dummy \
+	op monitor interval=60m \
+	op monitor interval=120m OCF_CHECK_LEVEL=10
+primitive p2 ocf:heartbeat:Dummy
+primitive p3 ocf:heartbeat:Dummy
+group g1 p1 p2
+clone c1 g1
+location l1 p3 100: node1
+order o1 inf: p3 c1
+colocation cl1 inf: c1 p3
+primitive d1 ocf:heartbeat:Dummy
+primitive d2 ocf:heartbeat:Dummy
+primitive d3 ocf:heartbeat:Dummy
+commit
+rename p3 pp3
+commit
+rename pp3 p3
+delete c1
+commit
+group g2 d1 d2
+commit
+delete g2
+commit
+filter "sed '/g1/s/p1/d1/'"
+group g2 d3 d2
+delete d2
+commit
+_test
+verify
+.
diff --git a/shell/regression/testcases/commit.exp b/shell/regression/testcases/commit.exp
new file mode 100644
index 0000000000..7effb74e89
--- /dev/null
+++ b/shell/regression/testcases/commit.exp
@@ -0,0 +1,69 @@
+.TRY Commits of all kinds
+.INP: configure
+.INP: _regtest on
+.INP: erase
+.INP: erase nodes
+.INP: property default-action-timeout=2m
+.INP: primitive st stonith:null 	params hostlist='node1' 	meta yoyo-meta="yoyo 2" 	op start requires=nothing 	op monitor interval=60m
+.INP: commit
+.INP: node node1 	attributes mem=16G
+.INP: primitive p1 ocf:heartbeat:Dummy 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
+.INP: primitive p2 ocf:heartbeat:Dummy
+.INP: primitive p3 ocf:heartbeat:Dummy
+.INP: group g1 p1 p2
+.INP: clone c1 g1
+.INP: location l1 p3 100: node1
+.INP: order o1 inf: p3 c1
+.INP: colocation cl1 inf: c1 p3
+.INP: primitive d1 ocf:heartbeat:Dummy
+.INP: primitive d2 ocf:heartbeat:Dummy
+.INP: primitive d3 ocf:heartbeat:Dummy
+.INP: commit
+.INP: rename p3 pp3
+INFO: 21: resource references in location:l1 updated
+INFO: 21: resource references in colocation:cl1 updated
+INFO: 21: resource references in order:o1 updated
+.INP: commit
+.INP: rename pp3 p3
+INFO: 23: resource references in location:l1 updated
+INFO: 23: resource references in colocation:cl1 updated
+INFO: 23: resource references in order:o1 updated
+.INP: delete c1
+INFO: 24: resource references in colocation:cl1 updated
+INFO: 24: resource references in order:o1 updated
+.INP: commit
+.INP: group g2 d1 d2
+.INP: commit
+.INP: delete g2
+.INP: commit
+.INP: filter "sed '/g1/s/p1/d1/'"
+.INP: group g2 d3 d2
+.INP: delete d2
+.INP: commit
+.INP: _test
+.INP: verify
+.INP: show
+node node1 \
+	attributes mem="16G"
+primitive d1 ocf:heartbeat:Dummy
+primitive d3 ocf:heartbeat:Dummy
+primitive p1 ocf:heartbeat:Dummy \
+	op monitor interval="60m" \
+	op monitor interval="120m" OCF_CHECK_LEVEL="10"
+primitive p2 ocf:heartbeat:Dummy
+primitive p3 ocf:heartbeat:Dummy
+primitive st stonith:null \
+	params hostlist="node1" \
+	meta yoyo-meta="yoyo 2" \
+	op start interval="0" requires="nothing" \
+	op monitor interval="60m"
+group g1 d1 p2
+group g2 d3
+location l1 p3 100: node1
+colocation cl1 inf: g1 p3
+order o1 inf: p3 g1
+property $id="cib-bootstrap-options" \
+	default-action-timeout="2m"
+.INP: commit
+INFO: 37: apparently there is nothing to commit
+INFO: 37: try changing something first
diff --git a/shell/regression/testcases/edit b/shell/regression/testcases/edit
new file mode 100644
index 0000000000..93db31f55e
--- /dev/null
+++ b/shell/regression/testcases/edit
@@ -0,0 +1,34 @@
+show Configuration editing
+property default-action-timeout=2m
+node node1 \
+	attributes mem=16G
+primitive st stonith:null \
+	params hostlist='node1' \
+	meta yoyo-meta="yoyo 2" \
+	op start requires=nothing \
+	op monitor interval=60m
+primitive p1 ocf:heartbeat:Dummy \
+	op monitor interval=60m \
+	op monitor interval=120m OCF_CHECK_LEVEL=10
+filter "sed '$aprimitive p2 ocf:heartbeat:Dummy'"
+filter "sed '$agroup g1 p1 p2'"
+filter "sed 's/p2/p3/;$aprimitive p3 ocf:heartbeat:Dummy'" g1
+filter "sed '$aclone c1 p2'"
+filter "sed 's/p2/g1/'" c1
+filter "sed '/clone/s/g1/p2/'" c1 g1
+filter "sed '/clone/s/p2/g1/;s/p3/p2/'" c1 g1
+filter "sed '1,$d'" c1 g1
+filter "sed -e '$aclone c1 g1' -e '$agroup g1 p1 p2'"
+location l1 p3 100: node1
+order o1 inf: p3 c1
+colocation cl1 inf: c1 p3
+filter "sed '/cl1/s/p3/p2/'"
+filter "sed '/cl1/d'"
+primitive d1 ocf:heartbeat:Dummy
+primitive d2 ocf:heartbeat:Dummy
+primitive d3 ocf:heartbeat:Dummy
+group g2 d1 d2
+filter "sed '/g2/s/d1/p1/;/g1/s/p1/d1/'"
+_test
+verify
+.
diff --git a/shell/regression/testcases/edit.exp b/shell/regression/testcases/edit.exp
new file mode 100644
index 0000000000..7c002f8396
--- /dev/null
+++ b/shell/regression/testcases/edit.exp
@@ -0,0 +1,57 @@
+.TRY Configuration editing
+.INP: configure
+.INP: _regtest on
+.INP: erase
+.INP: erase nodes
+.INP: property default-action-timeout=2m
+.INP: node node1 	attributes mem=16G
+.INP: primitive st stonith:null 	params hostlist='node1' 	meta yoyo-meta="yoyo 2" 	op start requires=nothing 	op monitor interval=60m
+.INP: primitive p1 ocf:heartbeat:Dummy 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
+.INP: filter "sed '$aprimitive p2 ocf:heartbeat:Dummy'"
+.INP: filter "sed '$agroup g1 p1 p2'"
+.INP: filter "sed 's/p2/p3/;$aprimitive p3 ocf:heartbeat:Dummy'" g1
+.INP: filter "sed '$aclone c1 p2'"
+.INP: filter "sed 's/p2/g1/'" c1
+.INP: filter "sed '/clone/s/g1/p2/'" c1 g1
+.INP: filter "sed '/clone/s/p2/g1/;s/p3/p2/'" c1 g1
+ERROR: 15: p2 already in use at c1
+.INP: filter "sed '1,$d'" c1 g1
+.INP: filter "sed -e '$aclone c1 g1' -e '$agroup g1 p1 p2'"
+.INP: location l1 p3 100: node1
+.INP: order o1 inf: p3 c1
+.INP: colocation cl1 inf: c1 p3
+.INP: filter "sed '/cl1/s/p3/p2/'"
+.INP: filter "sed '/cl1/d'"
+.INP: primitive d1 ocf:heartbeat:Dummy
+.INP: primitive d2 ocf:heartbeat:Dummy
+.INP: primitive d3 ocf:heartbeat:Dummy
+.INP: group g2 d1 d2
+.INP: filter "sed '/g2/s/d1/p1/;/g1/s/p1/d1/'"
+ERROR: 27: d1 already in use at g2
+ERROR: 27: p1 already in use at g1
+.INP: _test
+.INP: verify
+.INP: show
+node node1 \
+	attributes mem="16G"
+primitive d1 ocf:heartbeat:Dummy
+primitive d2 ocf:heartbeat:Dummy
+primitive d3 ocf:heartbeat:Dummy
+primitive p1 ocf:heartbeat:Dummy \
+	op monitor interval="60m" \
+	op monitor interval="120m" OCF_CHECK_LEVEL="10"
+primitive p2 ocf:heartbeat:Dummy
+primitive p3 ocf:heartbeat:Dummy
+primitive st stonith:null \
+	params hostlist="node1" \
+	meta yoyo-meta="yoyo 2" \
+	op start interval="0" requires="nothing" \
+	op monitor interval="60m"
+group g1 p1 p2
+group g2 d1 d2
+clone c1 g1
+location l1 p3 100: node1
+order o1 inf: p3 c1
+property $id="cib-bootstrap-options" \
+	default-action-timeout="2m"
+.INP: commit