diff --git a/testApp/testmon.cpp b/testApp/testmon.cpp
index 315e9ba..e7c8362 100644
--- a/testApp/testmon.cpp
+++ b/testApp/testmon.cpp
@@ -343,7 +343,7 @@ struct TestMonitor {
 
 MAIN(testmon)
 {
-    testPlan(0);
+    testPlan(79);
     TEST_METHOD(TestMonitor, test_event);
     TEST_METHOD(TestMonitor, test_share);
     TEST_METHOD(TestMonitor, test_ds_no_start);
diff --git a/testApp/testpdb.cpp b/testApp/testpdb.cpp
index 7e8c3d0..911b6ea 100644
--- a/testApp/testpdb.cpp
+++ b/testApp/testpdb.cpp
@@ -363,7 +363,8 @@ void testGroupMonitor(const PDBProvider::shared_pointer& prov)
 
     e = mon.poll();
     testOk1(!!e);
-    if(!!e) testEqual(toString(*e.elem->changedBitSet), "{2, 4, 5, 8, 9}");
+    testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld1.value")->getFieldOffset()==6);
+    if(!!e) testEqual(toString(*e.elem->changedBitSet), "{6, 8, 9, 12, 13}");
     else testFail("oops");
 
     testFieldEqual<pvd::PVDouble>(e, "fld1.value", 32.0);
@@ -410,7 +411,9 @@ void testGroupMonitorTriggers(const PDBProvider::shared_pointer& prov)
     e = mon.poll();
     testOk1(!!e);
 
-    if(!!e) testEqual(toString(*e.elem->changedBitSet), "{2, 4, 5, 8, 9, 42, 44, 45, 48, 49}");
+    testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld1.value")->getFieldOffset()==6);
+    testOk1(!!e && e.elem->pvStructurePtr->getSubFieldT("fld2.value")->getFieldOffset()==46);
+    if(!!e) testEqual(toString(*e.elem->changedBitSet), "{6, 8, 9, 12, 13, 46, 48, 49, 52, 53}");
     else testFail("oops");
 
     testFieldEqual<pvd::PVDouble>(e, "fld1.value", 15.0);
@@ -428,7 +431,7 @@ void p2pTestIoc_registerRecordDeviceDriver(struct dbBase *);
 
 MAIN(testpdb)
 {
-    testPlan(0);
+    testPlan(137);
     try{
         TestIOC IOC;
 
diff --git a/testApp/testpvif.cpp b/testApp/testpvif.cpp
index dcd8134..3317d14 100644
--- a/testApp/testpvif.cpp
+++ b/testApp/testpvif.cpp
@@ -194,7 +194,7 @@ void testScalar()
 
 MAIN(testpvif)
 {
-    testPlan(0);
+    testPlan(56);
     PVIF::Init();
     testScalar();
     return testDone();
diff --git a/testApp/teststream.cpp b/testApp/teststream.cpp
index ca52c5b..85330ae 100644
--- a/testApp/teststream.cpp
+++ b/testApp/teststream.cpp
@@ -78,7 +78,7 @@ static const char longmsg[] = "This message should be longer than the mimimum bu
 
 MAIN(teststream)
 {
-    testPlan(0);
+    testPlan(10);
     eltc(0);
     testNoBlock("hello");
     testNoBlock(longmsg);
diff --git a/testApp/testtest.cpp b/testApp/testtest.cpp
index 39573c1..68e9020 100644
--- a/testApp/testtest.cpp
+++ b/testApp/testtest.cpp
@@ -172,7 +172,7 @@ void testmonitor()
 
 MAIN(testtest)
 {
-    testPlan(0);
+    testPlan(46);
     testmonitor();
     TestProvider::testCounts();
     return testDone();