diff --git a/param_templates/diag_table.yaml b/param_templates/diag_table.yaml
index c30f177f..ceea133d 100644
--- a/param_templates/diag_table.yaml
+++ b/param_templates/diag_table.yaml
@@ -14,6 +14,8 @@ FieldLists:
                          "somint", "Rd_dx", "speed", "mlotst"]
 
     - &kpp_diags        ["KPP_OBLdepth:oml"]
+    - &kpp_diags_test   ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdT",
+                         "KPP_NLT_temp_budget", "KPP_NLT_saln_budget"]
 
     - &forcing_flds     ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
                          "hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
@@ -101,28 +103,55 @@ Files:
                               *transports ]
             $OCN_DIAG_MODE not in ["spinup", "none"]:
                 $USE_CFC_CAP == "True":
-                    - module:   "ocean_model"
-                      packing:  1                 # double precision
-                      lists:    [ *prognostic,
-                                  *hist_additional,
-                                  *kpp_diags,
-                                  *forcing_flds,
-                                  *surface_flds,
-                                  *visc_flds,
-                                  *transports,
-                                  *tracers,
-                                  *cfc_2d ]
+                    $TEST == False :
+                        - module:   "ocean_model"
+                          packing:  1                 # double precision
+                          lists:    [ *prognostic,
+                                      *hist_additional,
+                                      *kpp_diags,
+                                      *forcing_flds,
+                                      *surface_flds,
+                                      *visc_flds,
+                                      *transports,
+                                      *tracers,
+                                      *cfc_2d ]
+                    else:
+                        - module:   "ocean_model"
+                          packing:  1                 # double precision
+                          lists:    [ *prognostic,
+                                      *hist_additional,
+                                      *kpp_diags,
+                                      *kpp_diags_test,
+                                      *forcing_flds,
+                                      *surface_flds,
+                                      *visc_flds,
+                                      *transports,
+                                      *tracers,
+                                      *cfc_2d ]
                 else:
-                    - module:   "ocean_model"
-                      packing:  1                 # double precision
-                      lists:    [ *prognostic,
-                                  *hist_additional,
-                                  *kpp_diags,
-                                  *forcing_flds,
-                                  *surface_flds,
-                                  *visc_flds,
-                                  *transports,
-                                  *tracers ]
+                    $TEST == False :
+                        - module:   "ocean_model"
+                          packing:  1                 # double precision
+                          lists:    [ *prognostic,
+                                      *hist_additional,
+                                      *kpp_diags,
+                                      *forcing_flds,
+                                      *surface_flds,
+                                      *visc_flds,
+                                      *transports,
+                                      *tracers ]
+                    else:
+                        - module:   "ocean_model"
+                          packing:  1                 # double precision
+                          lists:    [ *prognostic,
+                                      *hist_additional,
+                                      *kpp_diags,
+                                      *kpp_diags_test,
+                                      *forcing_flds,
+                                      *surface_flds,
+                                      *visc_flds,
+                                      *transports,
+                                      *tracers ]
 
     # essential variable mapped to z_space
     hist_z_space:
diff --git a/param_templates/json/diag_table.json b/param_templates/json/diag_table.json
index 756d38ba..02d31811 100644
--- a/param_templates/json/diag_table.json
+++ b/param_templates/json/diag_table.json
@@ -42,6 +42,14 @@
       [
          "KPP_OBLdepth:oml"
       ],
+      [
+         "KPP_QminusSW",
+         "KPP_netSalt",
+         "KPP_NLT_dTdt",
+         "KPP_NLT_dSdT",
+         "KPP_NLT_temp_budget",
+         "KPP_NLT_saln_budget"
+      ],
       [
          "tauuo",
          "tauvo",
@@ -244,192 +252,398 @@
                }
             ],
             "$OCN_DIAG_MODE not in [\"spinup\", \"none\"]": {
-               "$USE_CFC_CAP == \"True\"": [
-                  {
-                     "module": "ocean_model",
-                     "packing": 1,
-                     "lists": [
-                        [
-                           "uo",
-                           "vo",
-                           "h",
-                           "e",
-                           "thetao",
-                           "so",
-                           "rhoinsitu",
-                           "KE",
-                           "rhopot0"
-                        ],
-                        [
-                           "soga",
-                           "thetaoga",
-                           "uh",
-                           "vh",
-                           "vhbt",
-                           "uhbt"
-                        ],
-                        [
-                           "KPP_OBLdepth:oml"
-                        ],
-                        [
-                           "tauuo",
-                           "tauvo",
-                           "friver",
-                           "prsn",
-                           "prlq",
-                           "evs",
-                           "hfsso",
-                           "rlntds",
-                           "hfsnthermds",
-                           "sfdsi",
-                           "rsntds",
-                           "hfds",
-                           "ustar",
-                           "hfsifrazil",
-                           "wfo",
-                           "vprec",
-                           "ficeberg",
-                           "fsitherm",
-                           "hflso",
-                           "pso",
-                           "seaice_melt_heat",
-                           "Heat_PmE",
-                           "salt_flux_added"
-                        ],
-                        [
-                           "SSH",
-                           "tos",
-                           "sos",
-                           "SSU",
-                           "SSV",
-                           "mass_wt",
-                           "opottempmint",
-                           "somint",
-                           "Rd_dx",
-                           "speed",
-                           "mlotst"
-                        ],
-                        [
-                           "diftrelo",
-                           "diftrblo",
-                           "difmxybo",
-                           "difmxylo"
-                        ],
-                        [
-                           "volcello",
-                           "vmo",
-                           "vhGM",
-                           "vhml",
-                           "umo",
-                           "uhGM",
-                           "uhml"
-                        ],
-                        [
-                           "agessc",
-                           "T_ady_2d",
-                           "T_adx_2d",
-                           "T_diffy_2d",
-                           "T_diffx_2d"
-                        ],
-                        [
-                           "cfc11_flux",
-                           "cfc12_flux",
-                           "ice_fraction",
-                           "u10_sqr"
+               "$USE_CFC_CAP == \"True\"": {
+                  "$TEST == False": [
+                     {
+                        "module": "ocean_model",
+                        "packing": 1,
+                        "lists": [
+                           [
+                              "uo",
+                              "vo",
+                              "h",
+                              "e",
+                              "thetao",
+                              "so",
+                              "rhoinsitu",
+                              "KE",
+                              "rhopot0"
+                           ],
+                           [
+                              "soga",
+                              "thetaoga",
+                              "uh",
+                              "vh",
+                              "vhbt",
+                              "uhbt"
+                           ],
+                           [
+                              "KPP_OBLdepth:oml"
+                           ],
+                           [
+                              "tauuo",
+                              "tauvo",
+                              "friver",
+                              "prsn",
+                              "prlq",
+                              "evs",
+                              "hfsso",
+                              "rlntds",
+                              "hfsnthermds",
+                              "sfdsi",
+                              "rsntds",
+                              "hfds",
+                              "ustar",
+                              "hfsifrazil",
+                              "wfo",
+                              "vprec",
+                              "ficeberg",
+                              "fsitherm",
+                              "hflso",
+                              "pso",
+                              "seaice_melt_heat",
+                              "Heat_PmE",
+                              "salt_flux_added"
+                           ],
+                           [
+                              "SSH",
+                              "tos",
+                              "sos",
+                              "SSU",
+                              "SSV",
+                              "mass_wt",
+                              "opottempmint",
+                              "somint",
+                              "Rd_dx",
+                              "speed",
+                              "mlotst"
+                           ],
+                           [
+                              "diftrelo",
+                              "diftrblo",
+                              "difmxybo",
+                              "difmxylo"
+                           ],
+                           [
+                              "volcello",
+                              "vmo",
+                              "vhGM",
+                              "vhml",
+                              "umo",
+                              "uhGM",
+                              "uhml"
+                           ],
+                           [
+                              "agessc",
+                              "T_ady_2d",
+                              "T_adx_2d",
+                              "T_diffy_2d",
+                              "T_diffx_2d"
+                           ],
+                           [
+                              "cfc11_flux",
+                              "cfc12_flux",
+                              "ice_fraction",
+                              "u10_sqr"
+                           ]
                         ]
-                     ]
-                  }
-               ],
-               "else": [
-                  {
-                     "module": "ocean_model",
-                     "packing": 1,
-                     "lists": [
-                        [
-                           "uo",
-                           "vo",
-                           "h",
-                           "e",
-                           "thetao",
-                           "so",
-                           "rhoinsitu",
-                           "KE",
-                           "rhopot0"
-                        ],
-                        [
-                           "soga",
-                           "thetaoga",
-                           "uh",
-                           "vh",
-                           "vhbt",
-                           "uhbt"
-                        ],
-                        [
-                           "KPP_OBLdepth:oml"
-                        ],
-                        [
-                           "tauuo",
-                           "tauvo",
-                           "friver",
-                           "prsn",
-                           "prlq",
-                           "evs",
-                           "hfsso",
-                           "rlntds",
-                           "hfsnthermds",
-                           "sfdsi",
-                           "rsntds",
-                           "hfds",
-                           "ustar",
-                           "hfsifrazil",
-                           "wfo",
-                           "vprec",
-                           "ficeberg",
-                           "fsitherm",
-                           "hflso",
-                           "pso",
-                           "seaice_melt_heat",
-                           "Heat_PmE",
-                           "salt_flux_added"
-                        ],
-                        [
-                           "SSH",
-                           "tos",
-                           "sos",
-                           "SSU",
-                           "SSV",
-                           "mass_wt",
-                           "opottempmint",
-                           "somint",
-                           "Rd_dx",
-                           "speed",
-                           "mlotst"
-                        ],
-                        [
-                           "diftrelo",
-                           "diftrblo",
-                           "difmxybo",
-                           "difmxylo"
-                        ],
-                        [
-                           "volcello",
-                           "vmo",
-                           "vhGM",
-                           "vhml",
-                           "umo",
-                           "uhGM",
-                           "uhml"
-                        ],
-                        [
-                           "agessc",
-                           "T_ady_2d",
-                           "T_adx_2d",
-                           "T_diffy_2d",
-                           "T_diffx_2d"
+                     }
+                  ],
+                  "else": [
+                     {
+                        "module": "ocean_model",
+                        "packing": 1,
+                        "lists": [
+                           [
+                              "uo",
+                              "vo",
+                              "h",
+                              "e",
+                              "thetao",
+                              "so",
+                              "rhoinsitu",
+                              "KE",
+                              "rhopot0"
+                           ],
+                           [
+                              "soga",
+                              "thetaoga",
+                              "uh",
+                              "vh",
+                              "vhbt",
+                              "uhbt"
+                           ],
+                           [
+                              "KPP_OBLdepth:oml"
+                           ],
+                           [
+                              "KPP_QminusSW",
+                              "KPP_netSalt",
+                              "KPP_NLT_dTdt",
+                              "KPP_NLT_dSdT",
+                              "KPP_NLT_temp_budget",
+                              "KPP_NLT_saln_budget"
+                           ],
+                           [
+                              "tauuo",
+                              "tauvo",
+                              "friver",
+                              "prsn",
+                              "prlq",
+                              "evs",
+                              "hfsso",
+                              "rlntds",
+                              "hfsnthermds",
+                              "sfdsi",
+                              "rsntds",
+                              "hfds",
+                              "ustar",
+                              "hfsifrazil",
+                              "wfo",
+                              "vprec",
+                              "ficeberg",
+                              "fsitherm",
+                              "hflso",
+                              "pso",
+                              "seaice_melt_heat",
+                              "Heat_PmE",
+                              "salt_flux_added"
+                           ],
+                           [
+                              "SSH",
+                              "tos",
+                              "sos",
+                              "SSU",
+                              "SSV",
+                              "mass_wt",
+                              "opottempmint",
+                              "somint",
+                              "Rd_dx",
+                              "speed",
+                              "mlotst"
+                           ],
+                           [
+                              "diftrelo",
+                              "diftrblo",
+                              "difmxybo",
+                              "difmxylo"
+                           ],
+                           [
+                              "volcello",
+                              "vmo",
+                              "vhGM",
+                              "vhml",
+                              "umo",
+                              "uhGM",
+                              "uhml"
+                           ],
+                           [
+                              "agessc",
+                              "T_ady_2d",
+                              "T_adx_2d",
+                              "T_diffy_2d",
+                              "T_diffx_2d"
+                           ],
+                           [
+                              "cfc11_flux",
+                              "cfc12_flux",
+                              "ice_fraction",
+                              "u10_sqr"
+                           ]
                         ]
-                     ]
-                  }
-               ]
+                     }
+                  ]
+               },
+               "else": {
+                  "$TEST == False": [
+                     {
+                        "module": "ocean_model",
+                        "packing": 1,
+                        "lists": [
+                           [
+                              "uo",
+                              "vo",
+                              "h",
+                              "e",
+                              "thetao",
+                              "so",
+                              "rhoinsitu",
+                              "KE",
+                              "rhopot0"
+                           ],
+                           [
+                              "soga",
+                              "thetaoga",
+                              "uh",
+                              "vh",
+                              "vhbt",
+                              "uhbt"
+                           ],
+                           [
+                              "KPP_OBLdepth:oml"
+                           ],
+                           [
+                              "tauuo",
+                              "tauvo",
+                              "friver",
+                              "prsn",
+                              "prlq",
+                              "evs",
+                              "hfsso",
+                              "rlntds",
+                              "hfsnthermds",
+                              "sfdsi",
+                              "rsntds",
+                              "hfds",
+                              "ustar",
+                              "hfsifrazil",
+                              "wfo",
+                              "vprec",
+                              "ficeberg",
+                              "fsitherm",
+                              "hflso",
+                              "pso",
+                              "seaice_melt_heat",
+                              "Heat_PmE",
+                              "salt_flux_added"
+                           ],
+                           [
+                              "SSH",
+                              "tos",
+                              "sos",
+                              "SSU",
+                              "SSV",
+                              "mass_wt",
+                              "opottempmint",
+                              "somint",
+                              "Rd_dx",
+                              "speed",
+                              "mlotst"
+                           ],
+                           [
+                              "diftrelo",
+                              "diftrblo",
+                              "difmxybo",
+                              "difmxylo"
+                           ],
+                           [
+                              "volcello",
+                              "vmo",
+                              "vhGM",
+                              "vhml",
+                              "umo",
+                              "uhGM",
+                              "uhml"
+                           ],
+                           [
+                              "agessc",
+                              "T_ady_2d",
+                              "T_adx_2d",
+                              "T_diffy_2d",
+                              "T_diffx_2d"
+                           ]
+                        ]
+                     }
+                  ],
+                  "else": [
+                     {
+                        "module": "ocean_model",
+                        "packing": 1,
+                        "lists": [
+                           [
+                              "uo",
+                              "vo",
+                              "h",
+                              "e",
+                              "thetao",
+                              "so",
+                              "rhoinsitu",
+                              "KE",
+                              "rhopot0"
+                           ],
+                           [
+                              "soga",
+                              "thetaoga",
+                              "uh",
+                              "vh",
+                              "vhbt",
+                              "uhbt"
+                           ],
+                           [
+                              "KPP_OBLdepth:oml"
+                           ],
+                           [
+                              "KPP_QminusSW",
+                              "KPP_netSalt",
+                              "KPP_NLT_dTdt",
+                              "KPP_NLT_dSdT",
+                              "KPP_NLT_temp_budget",
+                              "KPP_NLT_saln_budget"
+                           ],
+                           [
+                              "tauuo",
+                              "tauvo",
+                              "friver",
+                              "prsn",
+                              "prlq",
+                              "evs",
+                              "hfsso",
+                              "rlntds",
+                              "hfsnthermds",
+                              "sfdsi",
+                              "rsntds",
+                              "hfds",
+                              "ustar",
+                              "hfsifrazil",
+                              "wfo",
+                              "vprec",
+                              "ficeberg",
+                              "fsitherm",
+                              "hflso",
+                              "pso",
+                              "seaice_melt_heat",
+                              "Heat_PmE",
+                              "salt_flux_added"
+                           ],
+                           [
+                              "SSH",
+                              "tos",
+                              "sos",
+                              "SSU",
+                              "SSV",
+                              "mass_wt",
+                              "opottempmint",
+                              "somint",
+                              "Rd_dx",
+                              "speed",
+                              "mlotst"
+                           ],
+                           [
+                              "diftrelo",
+                              "diftrblo",
+                              "difmxybo",
+                              "difmxylo"
+                           ],
+                           [
+                              "volcello",
+                              "vmo",
+                              "vhGM",
+                              "vhml",
+                              "umo",
+                              "uhGM",
+                              "uhml"
+                           ],
+                           [
+                              "agessc",
+                              "T_ady_2d",
+                              "T_adx_2d",
+                              "T_diffy_2d",
+                              "T_diffx_2d"
+                           ]
+                        ]
+                     }
+                  ]
+               }
             }
          }
       },