Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files

(1) Re-structure tests to do one "extend" action at a time
(2) Re-try test till max limit before final failure

21 files changed, 39 insertions, 372 deletions

diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl
index d85594d..09255cc 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-esc-f1.ddl
@@ -4,8 +4,3 @@ dimension 0: 10->13 (increases)
     Data:
         (10) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}},
         (12) {3, {4, {4, 4, 4}, 4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl
index ab6c294..00ed390 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-esc-f3.ddl
@@ -3,8 +3,3 @@ Monitoring dataset /DSET_CMPD_ESC...
 dimension 0: 10->13 (increases)
     Data:
         (10) {{{2}}, {2}}, {{{3}}, {3}}, {{{4}}, {4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2}}, {2}}, {{{3}}, {3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl b/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl
index 039cbf3..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-esc-ff2.ddl
@@ -1,11 +1,3 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_ESC...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}, {{{4, 4, 4}}, {6, 
-        (12)  6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}
+dimension 0: 10->9 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-esc.ddl b/hl/tools/testfiles/w-ext-cmpd-esc.ddl
index 900b3f2..9b9a971 100644
--- a/hl/tools/testfiles/w-ext-cmpd-esc.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-esc.ddl
@@ -1,13 +1,3 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_ESC...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {1, {2, {2, 2, 2}, 2}, 3, {4, 4}},
-        (11) {2, {3, {3, 3, 3}, 3}, 4, {5, 5}},
-        (12) {3, {4, {4, 4, 4}, 4}, 5, {6, 6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}, 3, {4, 4}}, {2, {3, {3, 3, 3}, 3}, 4, {5, 
-        (2)  5}}
+dimension 0: 10->9 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-f1.ddl
index 7e0a066..029e4db 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f1.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-f1.ddl
@@ -1,11 +1,3 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}},
-        (12) {3, {4, {4, 4, 4}, 4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}}, {2, {3, {3, 3, 3}, 3}}
+dimension 0: 10->1 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-f2.ddl b/hl/tools/testfiles/w-ext-cmpd-f2.ddl
index ea69222..362cc94 100644
--- a/hl/tools/testfiles/w-ext-cmpd-f2.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-f2.ddl
@@ -4,8 +4,3 @@ dimension 0: 10->13 (increases)
     Data:
         (10) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}, {{{4, 4, 4}}, {6, 
         (12)  6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2, 2, 2}}, {4, 4}}, {{{3, 3, 3}}, {5, 5}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl b/hl/tools/testfiles/w-ext-cmpd-ff3.ddl
index 84e2919..6a54b97 100644
--- a/hl/tools/testfiles/w-ext-cmpd-ff3.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-ff3.ddl
@@ -1,10 +1,2 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) {{{2}}, {2}}, {{{3}}, {3}}, {{{4}}, {4}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {{{2}}, {2}}, {{{3}}, {3}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-label.ddl b/hl/tools/testfiles/w-ext-cmpd-label.ddl
index 84534ea..394d5a6 100644
--- a/hl/tools/testfiles/w-ext-cmpd-label.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-label.ddl
@@ -8,11 +8,3 @@ dimension 0: 10->13 (increases)
         (11)  field4={a=5, b=5}},
         (12) {field1=3, field2={a=4, b={a=4, b=4, c=4}, c=4}, field3=5, 
         (12)  field4={a=6, b=6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {field1=1, field2={a=2, b={a=2, b=2, c=2}, c=2}, field3=3, 
-        (1)  field4={a=4, b=4}},
-        (2) {field1=2, field2={a=3, b={a=3, b=3, c=3}, c=3}, field3=4, 
-        (2)  field4={a=5, b=5}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl b/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl
index 49abde9..9b4c235 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-two-f1.ddl
@@ -1,47 +1,15 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_TWO...
 dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-    Data:
-        (0,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (1,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (2,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (3,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-        (4,0) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,2) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,4) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,6) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,8) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (4,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,0) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,2) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,4) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,6) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,8) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}},
-        (5,10) {1, {1, {1, 1, 1}, 1}}, {1, {1, {1, 1, 1}, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {2, {2, {2, 2, 2}, 2}},
-        (7,0) {2, {2, {2, 2, 2}, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {3, {3, {3, 3, 3}, 3}},
-        (9,0) {3, {3, {3, 3, 3}, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-        (1,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-        (2,1) {4, {4, {4, 4, 4}, 4}}, {4, {4, {4, 4, 4}, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {7, {7, {7, 7, 7}, 7}}, {7, {7, {7, 7, 7}, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+dimension 1: 10->10 (unchanged)
+    Data:
+        (4,0) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (4,2) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (4,4) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (4,6) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (4,8) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (5,0) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (5,2) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (5,4) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (5,6) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}},
+        (5,8) {2, {2, {2, 2, 2}, 2}}, {2, {2, {2, 2, 2}, 2}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl b/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl
index 0878f35..94b5c99 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-two-f3.ddl
@@ -1,41 +1,4 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_TWO...
-dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-    Data:
-        (0,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (1,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (2,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (3,10) {{{1}}, {1}}, {{{1}}, {1}}
-        (4,0) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (4,4) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (4,8) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,0) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,4) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}},
-        (5,8) {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}, {{{1}}, {1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {{{2}}, {2}},
-        (7,0) {{{2}}, {2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {{{3}}, {3}},
-        (9,0) {{{3}}, {3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {{{4}}, {4}}, {{{4}}, {4}}
-        (1,1) {{{4}}, {4}}, {{{4}}, {4}}
-        (2,1) {{{4}}, {4}}, {{{4}}, {4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {{{7}}, {7}}, {{{7}}, {7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+dimension 0: 4->3 (decreases)
+dimension 1: 10->7 (decreases)
diff --git a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl b/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl
index 669547e..482da31 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-two-ff2.ddl
@@ -1,47 +1,8 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_TWO...
-dimension 0: 4->6 (increases)
+dimension 0: 4->3 (decreases)
 dimension 1: 10->12 (increases)
     Data:
-        (0,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (1,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (2,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (3,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-        (4,0) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,2) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,4) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,6) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,8) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (4,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,0) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,2) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,4) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,6) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,8) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}},
-        (5,10) {{{1, 1, 1}}, {1, 1}}, {{{1, 1, 1}}, {1, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {{{2, 2, 2}}, {2, 2}},
-        (7,0) {{{2, 2, 2}}, {2, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {{{3, 3, 3}}, {3, 3}},
-        (9,0) {{{3, 3, 3}}, {3, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-        (1,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-        (2,1) {{{4, 4, 4}}, {4, 4}}, {{{4, 4, 4}}, {4, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {{{7, 7, 7}}, {7, 7}}, {{{7, 7, 7}}, {7, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+        (0,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}}
+        (1,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}}
+        (2,10) {{{-1, -1, -1}}, {-1, -1}}, {{{-1, -1, -1}}, {-1, -1}}
diff --git a/hl/tools/testfiles/w-ext-cmpd-two.ddl b/hl/tools/testfiles/w-ext-cmpd-two.ddl
index a461226..57ffc2c 100644
--- a/hl/tools/testfiles/w-ext-cmpd-two.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd-two.ddl
@@ -1,67 +1,7 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_CMPD_TWO...
 dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
+dimension 1: 10->1 (decreases)
     Data:
-        (0,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (0,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (1,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (1,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (2,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (2,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (3,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (3,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-        (4,0) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,1) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,2) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,3) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,4) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,5) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,6) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,7) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,8) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,9) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (4,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,0) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,1) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,2) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,3) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,4) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,5) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,6) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,7) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,8) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,9) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,10) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}},
-        (5,11) {1, {1, {1, 1, 1}, 1}, 1, {1, 1}}
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}},
-        (7,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}}
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) {3, {3, {3, 3, 3}, 3}, 3, {3, 3}},
-        (9,0) {3, {3, {3, 3, 3}, 3}, 3, {3, 3}}
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (0,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-        (1,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (1,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-        (2,1) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}},
-        (2,2) {4, {4, {4, 4, 4}, 4}, 4, {4, 4}}
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) {7, {7, {7, 7, 7}, 7}, 7, {7, 7}},
-        (0,3) {7, {7, {7, 7, 7}, 7}, 7, {7, 7}}
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+        (4,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}},
+        (5,0) {2, {2, {2, 2, 2}, 2}, 2, {2, 2}}
diff --git a/hl/tools/testfiles/w-ext-cmpd.ddl b/hl/tools/testfiles/w-ext-cmpd.ddl
index 7e64a14..aac5be3 100644
--- a/hl/tools/testfiles/w-ext-cmpd.ddl
+++ b/hl/tools/testfiles/w-ext-cmpd.ddl
@@ -5,9 +5,3 @@ dimension 0: 10->13 (increases)
         (10) {1, {2, {2, 2, 2}, 2}, 3, {4, 4}},
         (11) {2, {3, {3, 3, 3}, 3}, 4, {5, 5}},
         (12) {3, {4, {4, 4, 4}, 4}, 5, {6, 6}}
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) {1, {2, {2, 2, 2}, 2}, 3, {4, 4}}, {2, {3, {3, 3, 3}, 3}, 4, {5, 
-        (2)  5}}
diff --git a/hl/tools/testfiles/w-ext-early.ddl b/hl/tools/testfiles/w-ext-early.ddl
index 1d963d7..bb72104 100644
--- a/hl/tools/testfiles/w-ext-early.ddl
+++ b/hl/tools/testfiles/w-ext-early.ddl
@@ -1,10 +1,3 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_ALLOC_EARLY...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) 0, 1, 2
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) 0, 1
+dimension 0: 10->9 (decreases)
diff --git a/hl/tools/testfiles/w-ext-late.ddl b/hl/tools/testfiles/w-ext-late.ddl
index f3a7cf2..a6f8265 100644
--- a/hl/tools/testfiles/w-ext-late.ddl
+++ b/hl/tools/testfiles/w-ext-late.ddl
@@ -1,10 +1,2 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_ALLOC_LATE...
-dimension 0: 10->13 (increases)
-    Data:
-        (10) 0, 1, 2
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) 0, 1
diff --git a/hl/tools/testfiles/w-ext-one-d.ddl b/hl/tools/testfiles/w-ext-one-d.ddl
index 249ff95..673370a 100644
--- a/hl/tools/testfiles/w-ext-one-d.ddl
+++ b/hl/tools/testfiles/w-ext-one-d.ddl
@@ -1,6 +1,3 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_ONE...
 dimension 0: 10->13 (increases)
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
diff --git a/hl/tools/testfiles/w-ext-one-simple.ddl b/hl/tools/testfiles/w-ext-one-simple.ddl
index 3bf0ef5..5df9dff 100644
--- a/hl/tools/testfiles/w-ext-one-simple.ddl
+++ b/hl/tools/testfiles/w-ext-one-simple.ddl
@@ -1,13 +1,6 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_ONE...
-dimension 0: 10->13 (increases)
-    Data:
-        0 
-        1 
-        2
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
+dimension 0: 10->12 (increases)
     Data:
         0 
         1
diff --git a/hl/tools/testfiles/w-ext-one.ddl b/hl/tools/testfiles/w-ext-one.ddl
index c4e75eb..9604020 100644
--- a/hl/tools/testfiles/w-ext-one.ddl
+++ b/hl/tools/testfiles/w-ext-one.ddl
@@ -3,8 +3,3 @@ Monitoring dataset /DSET_ONE...
 dimension 0: 10->13 (increases)
     Data:
         (10) 0, 1, 2
-dimension 0: 13->12 (decreases)
-dimension 0: 12->1 (decreases)
-dimension 0: 1->3 (increases)
-    Data:
-        (1) 0, 1
diff --git a/hl/tools/testfiles/w-ext-two-d.ddl b/hl/tools/testfiles/w-ext-two-d.ddl
index b71a9a6..5c7af0a 100644
--- a/hl/tools/testfiles/w-ext-two-d.ddl
+++ b/hl/tools/testfiles/w-ext-two-d.ddl
@@ -1,18 +1,4 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_TWO...
-dimension 0: 4->6 (increases)
-dimension 1: 10->12 (increases)
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+dimension 0: 4->2 (decreases)
+dimension 1: 10->10 (unchanged)
diff --git a/hl/tools/testfiles/w-ext-two-width.ddl b/hl/tools/testfiles/w-ext-two-width.ddl
index 52903de..9f09fde 100644
--- a/hl/tools/testfiles/w-ext-two-width.ddl
+++ b/hl/tools/testfiles/w-ext-two-width.ddl
@@ -1,41 +1,9 @@
 Opened "TEST.h5" with sec2 driver.
 Monitoring dataset /DSET_TWO...
-dimension 0: 4->6 (increases)
+dimension 0: 4->4 (unchanged)
 dimension 1: 10->12 (increases)
     Data:
-        (0,10) 1, 1
-        (1,10) 1, 1
-        (2,10) 1, 1
-        (3,10) 1, 1
-        (4,0) 1, 1, 1, 1, 1,
-        (4,5) 1, 1, 1, 1, 1,
-        (4,10) 1, 1,
-        (5,0) 1, 1, 1, 1, 1,
-        (5,5) 1, 1, 1, 1, 1,
-        (5,10) 1, 1
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) 2,
-        (7,0) 2
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) 3,
-        (9,0) 3
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) 4, 4
-        (1,1) 4, 4
-        (2,1) 4, 4
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) 7, 7
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+        (0,10) 0, 0
+        (1,10) 0, 0
+        (2,10) 0, 0
+        (3,10) 0, 0
diff --git a/hl/tools/testfiles/w-ext-two.ddl b/hl/tools/testfiles/w-ext-two.ddl
index 31df8d5..28ff075 100644
--- a/hl/tools/testfiles/w-ext-two.ddl
+++ b/hl/tools/testfiles/w-ext-two.ddl
@@ -3,35 +3,9 @@ Monitoring dataset /DSET_TWO...
 dimension 0: 4->6 (increases)
 dimension 1: 10->12 (increases)
     Data:
-        (0,10) 1, 1
-        (1,10) 1, 1
-        (2,10) 1, 1
-        (3,10) 1, 1
-        (4,0) 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        (5,0) 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
-dimension 0: 6->8 (increases)
-dimension 1: 12->1 (decreases)
-    Data:
-        (6,0) 2,
-        (7,0) 2
-dimension 0: 8->10 (increases)
-dimension 1: 1->1 (unchanged)
-    Data:
-        (8,0) 3,
-        (9,0) 3
-dimension 0: 10->3 (decreases)
-dimension 1: 1->3 (increases)
-    Data:
-        (0,1) 4, 4
-        (1,1) 4, 4
-        (2,1) 4, 4
-dimension 0: 3->2 (decreases)
-dimension 1: 3->2 (decreases)
-dimension 0: 2->1 (decreases)
-dimension 1: 2->2 (unchanged)
-dimension 0: 1->1 (unchanged)
-dimension 1: 2->4 (increases)
-    Data:
-        (0,2) 7, 7
-dimension 0: 1->1 (unchanged)
-dimension 1: 4->3 (decreases)
+        (0,10) 2, 2
+        (1,10) 2, 2
+        (2,10) 2, 2
+        (3,10) 2, 2
+        (4,0) 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        (5,0) 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2