diff --git a/tools/shell/regression/testcases/confbasic b/tools/shell/regression/testcases/confbasic
index 84c27ea971..48069c1fa1 100644
--- a/tools/shell/regression/testcases/confbasic
+++ b/tools/shell/regression/testcases/confbasic
@@ -1,55 +1,56 @@
 show Basic configure
 node node1
 delete node1
 node node1 \
 	attributes mem=16G
 node pingnode:ping
 primitive st stonith:null \
 	params hostlist='node1' \
 	meta yoyo-meta="yoyo 2" \
 	op start requires=nothing \
 	op monitor interval=60m
 primitive d1 ocf:heartbeat:Dummy \
 	operations $id=d1-ops \
-	op monitor interval=60m
+	op monitor interval=60m \
+	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay=60
 monitor d2:Started 60s:30s
 group g1 d1 d2
 primitive d3 ocf:heartbeat:Dummy
 clone c d3 \
 	meta clone-max=1
 primitive d4 ocf:heartbeat:Dummy
 ms m d4
 delete m
 master m d4
 primitive d5 ocf:heartbeat:Dummy \
 	operations $id-ref=d1-ops
 primitive d6 ocf:heartbeat:Dummy \
 	operations $id-ref=d1
 location l1 g1 100: node1
 location l2 c \
 	rule $id=l2-rule1 100: #uname eq node1
 location l3 d5 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule -inf: not_defined pingd or pingd lte 0 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l6 d5 \
 	rule $id-ref=l2-rule1
 location l7 d5 \
 	rule $id-ref=l2
 collocation c1 inf: d5 d6
 collocation c2 inf: d5:Started d6:Started
 order o1 mandatory: d5 d6
 order o2 advisory: d5:start d6:promote
 property stonith-enabled=true
 property $id=cpset2 maintenance-mode=true
 rsc_defaults failure-timeout=10m
 op_defaults $id=opsdef2 record-pending=true
 _test
 verify
 .
diff --git a/tools/shell/regression/testcases/confbasic-xml b/tools/shell/regression/testcases/confbasic-xml
index 1535417172..9c9f4229ba 100644
--- a/tools/shell/regression/testcases/confbasic-xml
+++ b/tools/shell/regression/testcases/confbasic-xml
@@ -1,55 +1,56 @@
 showxml Basic configure (xml dump)
 node node1
 delete node1
 node node1 \
 	attributes mem=16G
 node pingnode:ping
 primitive st stonith:null \
 	params hostlist='node1' \
 	meta yoyo-meta="yoyo 2" \
 	op start requires=nothing \
 	op monitor interval=60m
 primitive d1 ocf:heartbeat:Dummy \
 	operations $id=d1-ops \
-	op monitor interval=60m
+	op monitor interval=60m \
+	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay=60
 monitor d2:Started 60s:30s
 group g1 d1 d2
 primitive d3 ocf:heartbeat:Dummy
 clone c d3 \
 	meta clone-max=1
 primitive d4 ocf:heartbeat:Dummy
 ms m d4
 delete m
 master m d4
 primitive d5 ocf:heartbeat:Dummy \
 	operations $id-ref=d1-ops
 primitive d6 ocf:heartbeat:Dummy \
 	operations $id-ref=d1
 location l1 g1 100: node1
 location l2 c \
 	rule $id=l2-rule1 100: #uname eq node1
 location l3 d5 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule -inf: not_defined pingd or pingd lte 0 \
 	rule inf: #uname eq node1 and pingd gt 0
 location l6 d5 \
 	rule $id-ref=l2-rule1
 location l7 d5 \
 	rule $id-ref=l2
 collocation c1 inf: d5 d6
 collocation c2 inf: d5:Started d6:Started
 order o1 mandatory: d5 d6
 order o2 advisory: d5:start d6:promote
 property stonith-enabled=true
 property $id=cpset2 maintenance-mode=true
 rsc_defaults failure-timeout=10m
 op_defaults $id=opsdef2 record-pending=true
 _test
 verify
 .
diff --git a/tools/shell/regression/testcases/confbasic-xml.exp b/tools/shell/regression/testcases/confbasic-xml.exp
index 9e6415dfc6..f05f5f1392 100644
--- a/tools/shell/regression/testcases/confbasic-xml.exp
+++ b/tools/shell/regression/testcases/confbasic-xml.exp
@@ -1,116 +1,121 @@
 <?xml version="1.0" ?>
 <cib admin_epoch="0" crm_feature_set="3.0.1" dc-uuid="f36760d8-d84a-46b2-b452-4c8cac8b3396" epoch="0" have-quorum="1" num_updates="1" remote-tls-port="0" validate-with="pacemaker-1.0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="true"/>
       </cluster_property_set>
       <cluster_property_set id="cpset2">
         <nvpair id="cpset2-maintenance-mode" name="maintenance-mode" value="true"/>
       </cluster_property_set>
     </crm_config>
     <rsc_defaults>
       <meta_attributes id="rsc-options">
         <nvpair id="rsc-options-failure-timeout" name="failure-timeout" value="10m"/>
       </meta_attributes>
     </rsc_defaults>
     <op_defaults>
       <meta_attributes id="opsdef2">
         <nvpair id="opsdef2-record-pending" name="record-pending" value="true"/>
       </meta_attributes>
     </op_defaults>
     <nodes>
       <node id="node1" type="normal" uname="node1">
         <instance_attributes id="node1-instance_attributes">
           <nvpair id="node1-instance_attributes-mem" name="mem" value="16G"/>
         </instance_attributes>
       </node>
       <node id="pingnode" type="ping" uname="pingnode"/>
     </nodes>
     <resources>
+      <master id="m">
+        <primitive class="ocf" id="d4" provider="heartbeat" type="Dummy"/>
+      </master>
+      <primitive class="ocf" id="d5" provider="heartbeat" type="Dummy">
+        <operations id-ref="d1-ops"/>
+      </primitive>
       <primitive class="stonith" id="st" type="null">
         <instance_attributes id="st-instance_attributes">
           <nvpair id="st-instance_attributes-hostlist" name="hostlist" value="node1"/>
         </instance_attributes>
         <meta_attributes id="st-meta_attributes">
           <nvpair id="st-meta_attributes-yoyo-meta" name="yoyo-meta" value="yoyo 2"/>
         </meta_attributes>
         <operations>
           <op id="st-start-0" interval="0" name="start" requires="nothing"/>
           <op id="st-monitor-60m" interval="60m" name="monitor"/>
         </operations>
       </primitive>
       <group id="g1">
         <primitive class="ocf" id="d1" provider="heartbeat" type="Dummy">
           <operations id="d1-ops">
             <op id="d1-monitor-60m" interval="60m" name="monitor"/>
+            <op id="d1-monitor-120m" interval="120m" name="monitor">
+              <instance_attributes id="d1-monitor-120m-instance_attributes">
+                <nvpair id="d1-monitor-120m-instance_attributes-OCF_CHECK_LEVEL" name="OCF_CHECK_LEVEL" value="10"/>
+              </instance_attributes>
+            </op>
             <op id="d1-monitor-60s" interval="60s" name="monitor" timeout="30s"/>
           </operations>
         </primitive>
         <primitive class="ocf" id="d2" provider="heartbeat" type="Delay">
           <instance_attributes id="d2-instance_attributes">
             <nvpair id="d2-instance_attributes-mondelay" name="mondelay" value="60"/>
           </instance_attributes>
           <operations>
             <op id="d2-monitor-60s" interval="60s" name="monitor" role="Started" timeout="30s"/>
           </operations>
         </primitive>
       </group>
-      <master id="m">
-        <primitive class="ocf" id="d4" provider="heartbeat" type="Dummy"/>
-      </master>
-      <primitive class="ocf" id="d5" provider="heartbeat" type="Dummy">
+      <primitive class="ocf" id="d6" provider="heartbeat" type="Dummy">
         <operations id-ref="d1-ops"/>
       </primitive>
       <clone id="c">
         <meta_attributes id="c-meta_attributes">
           <nvpair id="c-meta_attributes-clone-max" name="clone-max" value="1"/>
         </meta_attributes>
         <primitive class="ocf" id="d3" provider="heartbeat" type="Dummy"/>
       </clone>
-      <primitive class="ocf" id="d6" provider="heartbeat" type="Dummy">
-        <operations id-ref="d1-ops"/>
-      </primitive>
     </resources>
     <constraints>
       <rsc_location id="l3" rsc="d5">
         <rule id="l3-rule" score="INFINITY">
           <expression attribute="#uname" id="l3-expression" operation="eq" value="node1"/>
           <expression attribute="pingd" id="l3-expression-0" operation="gt" value="0"/>
         </rule>
       </rsc_location>
-      <rsc_location id="l7" rsc="d5">
-        <rule id-ref="l2-rule1"/>
-      </rsc_location>
-      <rsc_order first="d5" first-action="start" id="o2" score="0" then="d6" then-action="promote"/>
       <rsc_location id="l4" rsc="d5">
         <rule boolean-op="or" id="l4-rule" score="-INFINITY">
           <expression attribute="pingd" id="l4-expression" operation="not_defined"/>
           <expression attribute="pingd" id="l4-expression-0" operation="lte" value="0"/>
         </rule>
       </rsc_location>
-      <rsc_colocation id="c1" rsc="d5" score="INFINITY" with-rsc="d6"/>
+      <rsc_location id="l1" node="node1" rsc="g1" score="100"/>
+      <rsc_colocation id="c2" rsc="d5" rsc-role="Started" score="INFINITY" with-rsc="d6" with-rsc-role="Started"/>
+      <rsc_order first="d5" first-action="start" id="o2" score="0" then="d6" then-action="promote"/>
       <rsc_location id="l6" rsc="d5">
         <rule id-ref="l2-rule1"/>
       </rsc_location>
       <rsc_order first="d5" id="o1" score="INFINITY" then="d6"/>
-      <rsc_location id="l1" node="node1" rsc="g1" score="100"/>
       <rsc_location id="l5" rsc="d5">
         <rule boolean-op="or" id="l5-rule" score="-INFINITY">
           <expression attribute="pingd" id="l5-expression" operation="not_defined"/>
           <expression attribute="pingd" id="l5-expression-0" operation="lte" value="0"/>
         </rule>
         <rule id="l5-rule-0" score="INFINITY">
           <expression attribute="#uname" id="l5-expression-1" operation="eq" value="node1"/>
           <expression attribute="pingd" id="l5-expression-2" operation="gt" value="0"/>
         </rule>
       </rsc_location>
-      <rsc_colocation id="c2" rsc="d5" rsc-role="Started" score="INFINITY" with-rsc="d6" with-rsc-role="Started"/>
       <rsc_location id="l2" rsc="c">
         <rule id="l2-rule1" score="100">
           <expression attribute="#uname" id="l2-expression" operation="eq" value="node1"/>
         </rule>
       </rsc_location>
+      <rsc_location id="l7" rsc="d5">
+        <rule id-ref="l2-rule1"/>
+      </rsc_location>
+      <rsc_colocation id="c1" rsc="d5" score="INFINITY" with-rsc="d6"/>
     </constraints>
   </configuration>
 </cib>
diff --git a/tools/shell/regression/testcases/confbasic.exp b/tools/shell/regression/testcases/confbasic.exp
index 9aef16716e..dad21a8a35 100644
--- a/tools/shell/regression/testcases/confbasic.exp
+++ b/tools/shell/regression/testcases/confbasic.exp
@@ -1,93 +1,94 @@
 .TRY Basic configure
 .INP: configure
 .INP: _regtest on
 .INP: erase
 .INP: erase nodes
 .INP: node node1
 .INP: delete node1
 .INP: node node1 	attributes mem=16G
 .INP: node pingnode:ping
 .INP: primitive st stonith:null 	params hostlist='node1' 	meta yoyo-meta="yoyo 2" 	op start requires=nothing 	op monitor interval=60m
-.INP: primitive d1 ocf:heartbeat:Dummy 	operations $id=d1-ops 	op monitor interval=60m
+.INP: primitive d1 ocf:heartbeat:Dummy 	operations $id=d1-ops 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
 .INP: monitor d1 60s:30s
 .INP: primitive d2 ocf:heartbeat:Delay 	params mondelay=60
 .INP: monitor d2:Started 60s:30s
 .INP: group g1 d1 d2
 .INP: primitive d3 ocf:heartbeat:Dummy
 .INP: clone c d3 	meta clone-max=1
 .INP: primitive d4 ocf:heartbeat:Dummy
 .INP: ms m d4
 .INP: delete m
 .INP: master m d4
 .INP: primitive d5 ocf:heartbeat:Dummy 	operations $id-ref=d1-ops
 .INP: primitive d6 ocf:heartbeat:Dummy 	operations $id-ref=d1
 .INP: location l1 g1 100: node1
 .INP: location l2 c 	rule $id=l2-rule1 100: #uname eq node1
 .INP: location l3 d5 	rule inf: #uname eq node1 and pingd gt 0
 .INP: location l4 d5 	rule -inf: not_defined pingd or pingd lte 0
 .INP: location l5 d5 	rule -inf: not_defined pingd or pingd lte 0 	rule inf: #uname eq node1 and pingd gt 0
 .INP: location l6 d5 	rule $id-ref=l2-rule1
 .INP: location l7 d5 	rule $id-ref=l2
 .INP: collocation c1 inf: d5 d6
 .INP: collocation c2 inf: d5:Started d6:Started
 .INP: order o1 mandatory: d5 d6
 .INP: order o2 advisory: d5:start d6:promote
 .INP: property stonith-enabled=true
 .INP: property $id=cpset2 maintenance-mode=true
 .INP: rsc_defaults failure-timeout=10m
 .INP: op_defaults $id=opsdef2 record-pending=true
 .INP: _test
 .INP: verify
 .INP: show
 node node1 \
 	attributes mem="16G"
 node pingnode:ping
 primitive d1 ocf:heartbeat:Dummy \
 	operations $id="d1-ops" \
 	op monitor interval="60m" \
+	op monitor interval="120m" OCF_CHECK_LEVEL="10" \
 	op monitor interval="60s" timeout="30s"
 primitive d2 ocf:heartbeat:Delay \
 	params mondelay="60" \
 	op monitor interval="60s" role="Started" timeout="30s"
 primitive d3 ocf:heartbeat:Dummy
 primitive d4 ocf:heartbeat:Dummy
 primitive d5 ocf:heartbeat:Dummy \
 	operations  $id-ref="d1-ops"
 primitive d6 ocf:heartbeat:Dummy \
 	operations  $id-ref="d1-ops"
 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 d2
 ms m d4
 clone c d3 \
 	meta clone-max="1"
 location l1 g1 100: node1
 location l2 c \
 	rule $id="l2-rule1" 100: #uname eq node1
 location l3 d5 \
 	rule $id="l3-rule" inf: #uname eq node1 and pingd gt 0
 location l4 d5 \
 	rule $id="l4-rule" -inf: not_defined pingd or pingd lte 0
 location l5 d5 \
 	rule $id="l5-rule" -inf: not_defined pingd or pingd lte 0 \
 	rule $id="l5-rule-0" inf: #uname eq node1 and pingd gt 0
 location l6 d5 \
 	rule $id-ref="l2-rule1"
 location l7 d5 \
 	rule $id-ref="l2-rule1"
 colocation c1 inf: d5 d6
 colocation c2 inf: d5:Started d6:Started
 order o1 inf: d5 d6
 order o2 0: d5:start d6:promote
 property $id="cib-bootstrap-options" \
 	stonith-enabled="true"
 property $id="cpset2" \
 	maintenance-mode="true"
 rsc_defaults $id="rsc-options" \
 	failure-timeout="10m"
 op_defaults $id="opsdef2" \
 	record-pending="true"
 .INP: commit