diff --git a/test/testinput/3dhyb.yml b/test/testinput/3dhyb.yml
index 2427cff8f..06ec2539a 100644
--- a/test/testinput/3dhyb.yml
+++ b/test/testinput/3dhyb.yml
@@ -151,10 +151,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dhyb
-        date: *bkg_date
-        exp: 3dhyb.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dhyb
+          date: *bkg_date
+          exp: 3dhyb.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dhyb
diff --git a/test/testinput/3dhybfgat.yml b/test/testinput/3dhybfgat.yml
index 4ef12ae05..b91f6fe18 100644
--- a/test/testinput/3dhybfgat.yml
+++ b/test/testinput/3dhybfgat.yml
@@ -167,10 +167,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dhybfgat
-        date: *date_begin
-        exp: 3dhybfgat.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dhybfgat
+          date: *date_begin
+          exp: 3dhybfgat.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dhybfgat
diff --git a/test/testinput/3dvar_godas.yml b/test/testinput/3dvar_godas.yml
index a04ae351b..421b6507c 100644
--- a/test/testinput/3dvar_godas.yml
+++ b/test/testinput/3dvar_godas.yml
@@ -255,10 +255,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dvar_godas
-        date: *bkg_date
-        exp: 3dvar_godas.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dvar_godas
+          date: *bkg_date
+          exp: 3dvar_godas.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dvar_godas
diff --git a/test/testinput/3dvar_single_ob.yml b/test/testinput/3dvar_single_ob.yml
index 099b96f16..9216d6b08 100644
--- a/test/testinput/3dvar_single_ob.yml
+++ b/test/testinput/3dvar_single_ob.yml
@@ -76,10 +76,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dvar_single_ob
-        date: *bkg_date
-        exp: 3dvar_single_ob.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dvar_single_ob
+          date: *bkg_date
+          exp: 3dvar_single_ob.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dvar_single_ob
diff --git a/test/testinput/3dvar_soca.yml b/test/testinput/3dvar_soca.yml
index ab07db8a1..2c90d5374 100644
--- a/test/testinput/3dvar_soca.yml
+++ b/test/testinput/3dvar_soca.yml
@@ -338,10 +338,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dvar_soca
-        date: *bkg_date
-        exp: 3dvar_soca.iter1
-        type: incr
+        state component:
+          datadir: data_generated/3dvar_soca
+          date: *bkg_date
+          exp: 3dvar_soca.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dvar_soca
diff --git a/test/testinput/3dvarfgat.yml b/test/testinput/3dvarfgat.yml
index ccb4f4b2f..2fa686d98 100644
--- a/test/testinput/3dvarfgat.yml
+++ b/test/testinput/3dvarfgat.yml
@@ -271,10 +271,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dvarfgat
-        date: *bkg_date
-        exp: 3dvarfgat.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dvarfgat
+          date: *bkg_date
+          exp: 3dvarfgat.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dvarfgat
diff --git a/test/testinput/3dvarlowres_soca.yml b/test/testinput/3dvarlowres_soca.yml
index 9372b3e1c..1ad6bb4ab 100644
--- a/test/testinput/3dvarlowres_soca.yml
+++ b/test/testinput/3dvarlowres_soca.yml
@@ -216,10 +216,11 @@ variational:
     online diagnostics:
       write increment: true
       increment:
-        datadir: data_generated/3dvarlowres_soca
-        date: *bkg_date
-        exp: 3dvarlowres_soca.iter1
-        type: incr
+        state component:      
+          datadir: data_generated/3dvarlowres_soca
+          date: *bkg_date
+          exp: 3dvarlowres_soca.iter1
+          type: incr
 
 output:
   datadir: data_generated/3dvarlowres_soca