diff --git a/tests/default_options/SPECIES/SPECIES.README b/tests/default_options/SPECIES/SPECIES.README
deleted file mode 100644
index 4a1e85794825f819fbbb2afdcf655101ca9a3369..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES.README
+++ /dev/null
@@ -1,18 +0,0 @@
-Specifies all physico-chemical properties for the species. 
-
-To generate an overview table compile the specoverview.f90 program
-
-gfortran specoverview.f90 -o specoverview
-./specoverview
-
-UPDATE FOR FLEXPART VERSION 10.0 DEV:
---------------------------------------------------------------------------------
-Please note that the format of the SPECIES files has changed from the previous
-version (9.2) of FLEXPART and it is important to update all SPECIES files
-accordingly. The use of SPECIES files from older FLEXPART versions may lead to
-run-time errors or erroneous results.
---------------------------------------------------------------------------------
-Half life due to radioactive or chemical decay and can be switched off by
-specifying a negative value. Molecular weight (molweight of the species, needed
-for mixing ratio output)
---------------------------------------------------------------------------------
diff --git a/tests/default_options/SPECIES/SPECIES_002 b/tests/default_options/SPECIES/SPECIES_002
deleted file mode 100644
index 371e65b09b7f5844798f08843826a98890ba188b..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_002
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="O3",               ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.,                   ! Dry deposition (particles) - dquer
- PDSIGMA=0.,                  ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.9,                ! Alternative: dry deposition velocity
- PRELDIFF=1.6,                ! Dry deposition (gases) - D
- PHENRY=1.0E-2,               ! Dry deposition (gases) - Henrys const.
- PF0=1,                       ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=48.0,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_003 b/tests/default_options/SPECIES/SPECIES_003
deleted file mode 100644
index 3df5f23c95c7778e2962877e8b33e34e82684bb3..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_003
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="NO",               ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=8.0E-6,            ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,             ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.2,                ! Dry deposition (gases) - D
- PHENRY=2.0E-03,              ! Dry deposition (gases) - Henrys const.
- PF0=0.0,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=30.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9               ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_004 b/tests/default_options/SPECIES/SPECIES_004
deleted file mode 100644
index 2fea08e601e305dc0d98e3a6f6c7fbe2320eb182..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_004
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="NO2",              ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=1.0E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E9,             ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.6,                ! Dry deposition (gases) - D
- PHENRY=1.0E-02,              ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=46.0,           ! molweight
- POHCCONST=-0.9E9,            ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               !  OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_005 b/tests/default_options/SPECIES/SPECIES_005
deleted file mode 100644
index 900a461cc8fbc924797f2f21e2e83c782adc5738..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_005
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="HNO3",             ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=8.0E-04,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.9,                ! Dry deposition (gases) - D
- PHENRY=1E14,                 ! Dry deposition (gases) - Henrys const.
- PF0=0,                       ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=63.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_006 b/tests/default_options/SPECIES/SPECIES_006
deleted file mode 100644
index 446441a69dd50bcbaf9b6c246f7f924538716087..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_006
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="HNO2",             ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.6,                ! Dry deposition (gases) - D
- PHENRY=100000.0,             ! Dry deposition (gases) - Henrys const.
- PF0=.1,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=47.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_007 b/tests/default_options/SPECIES/SPECIES_007
deleted file mode 100644
index 362ff3ae308077ce499379d474c950f119b40a64..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_007
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="H2O2",             ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=1.0E-04,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.4,                ! Dry deposition (gases) - D
- PHENRY=100000.0,             ! Dry deposition (gases) - Henrys const.
- PF0=1.0,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=34.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_008 b/tests/default_options/SPECIES/SPECIES_008
deleted file mode 100644
index 5c49b9b07ca682b503881893aa1c5e4506e21259..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_008
+++ /dev/null
@@ -1,26 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="NO2",              ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=1.0E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E9,             ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.6,                ! Dry deposition (gases) - D
- PHENRY=1.0E-02,              ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=46.0,           ! molweight
- POHCCONST=-0.9E9,            ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               !  OH Reaction rate -  N (no unit)
- PAREA_HOUR=0.578, 0.491, 0.428, 0.329, 0.384, 0.485, 0.763, 1.103, 1.084, 1.047, 1.096, 1.196, 1.298, 1.357, 1.447, 1.565, 1.636, 1.662, 1.401, 1.168, 1.031, 0.926, 0.816, 0.709,
- PPOINT_HOUR=0.845, 0.806, 0.786, 0.779, 0.793, 0.832, 0.895, 0.977, 1.031, 1.071, 1.105, 1.118, 1.131, 1.136, 1.143, 1.141, 1.133, 1.118, 1.097, 1.091, 1.079, 1.036, 0.966, 0.892,
- PAREA_DOW=1.060, 1.060, 1.060, 1.060, 1.060, 0.900, 0.000,
- PPOINT_DOW=1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
- /
diff --git a/tests/default_options/SPECIES/SPECIES_009 b/tests/default_options/SPECIES/SPECIES_009
deleted file mode 100644
index b15e09554361536c1c8b32906e52bbe191879843..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_009
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="HCHO",             ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1,3,                ! Dry deposition (gases) - D
- PHENRY=6000.0,               ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=30.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit) 
- /
diff --git a/tests/default_options/SPECIES/SPECIES_010 b/tests/default_options/SPECIES/SPECIES_010
deleted file mode 100644
index 2fb4e88d6d5a676b86bafbf6e796ea6aa536372f..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_010
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="PAN",           ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=2.6,                ! Dry deposition (gases) - D
- PHENRY=3.6,                  ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=121.0,          ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_011 b/tests/default_options/SPECIES/SPECIES_011
deleted file mode 100644
index 371c515e066acf5aa270eca7071d3565b2f37a46..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_011
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="NH3",              ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=9.9E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=1.1,                ! Dry deposition (gases) - D
- PHENRY=2.0E14,               ! Dry deposition (gases) - Henrys const.
- PF0=0.0,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=17.0,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate -  N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_012 b/tests/default_options/SPECIES/SPECIES_012
deleted file mode 100644
index d4bd4ac24b38100229c704304ae96b6c0c33c4df..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_012
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="SO4-aero",        ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2000.0,             ! Dry deposition (particles) - rho
- PDQUER=4.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E+9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_013 b/tests/default_options/SPECIES/SPECIES_013
deleted file mode 100644
index 21da254fcdd378f610aca68f96f3c5af9b20ba01..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_013
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="NO3-aero",         ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2.0E+3,             ! Dry deposition (particles) - rho
- PDQUER=4.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E+9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E+9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_014 b/tests/default_options/SPECIES/SPECIES_014
deleted file mode 100644
index 5ad9079085e99f49c04992745030961373892f70..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_014
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="I2-131",           ! Tracer name
- PDECAY=691200.0,             ! Species half life
- PWETA_GAS=8.0E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=2.7,                ! Dry deposition (gases) - D
- PHENRY=100000.0,             ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,          ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit) 
- /
diff --git a/tests/default_options/SPECIES/SPECIES_015 b/tests/default_options/SPECIES/SPECIES_015
deleted file mode 100644
index d8fad0fa33f09a980ad5fe4ada8ec27d60bcf51a..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_015
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="I-131",            ! Tracer name
- PDECAY=691200.0,             ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2500.0,             ! Dry deposition (particles) - rho
- PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-9.9,                 ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=350.0,          ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_016 b/tests/default_options/SPECIES/SPECIES_016
deleted file mode 100644
index fad26c579c2d9f2f78968e1698d73d3fa88e0350..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_016
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Cs-137",          ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.9,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=1900.0,             ! Dry deposition (particles) - rho
- PDQUER=0.4E-06,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_017 b/tests/default_options/SPECIES/SPECIES_017
deleted file mode 100644
index 54d9aec279df0b46b9fbc29ea9e4736b776be20e..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_017
+++ /dev/null
@@ -1,23 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Y-91",             ! Tracer name
- PDECAY=5037120.0,            ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2500.0,             ! Dry deposition (particles) - rho
- PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9.0,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=350.0,          ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_018 b/tests/default_options/SPECIES/SPECIES_018
deleted file mode 100644
index e10df5743d8b18d2d5732006eba361ef5f60ee9b..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_018
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Ru-106",          ! Tracer name
- PDECAY=31536000.0,           ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2500.0,             ! Dry deposition (particles) - rho
- PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=350.0,          ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_019 b/tests/default_options/SPECIES/SPECIES_019
deleted file mode 100644
index 76cc9868d03c2f8c36fce39d402bb6b337a5bca2..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_019
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Kr-85",            ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=83.8,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_020 b/tests/default_options/SPECIES/SPECIES_020
deleted file mode 100644
index 17dafa57ed84681ac468be1008e35d7551a6829a..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_020
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Sr-90",            ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=2500.0,             ! Dry deposition (particles) - rho
- PDQUER=6.0E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_021 b/tests/default_options/SPECIES/SPECIES_021
deleted file mode 100644
index 4d89b6c7b82b42f59f48d30a1aaea7bc709af386..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_021
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="Xe-133",           ! Tracer name
- PDECAY=453168.0,             ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_022 b/tests/default_options/SPECIES/SPECIES_022
deleted file mode 100644
index 50accc0769f96843b96d488b588d3cb095b9528b..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_022
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="CO",            ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=28.0,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_023 b/tests/default_options/SPECIES/SPECIES_023
deleted file mode 100644
index 12461e766ff8be1afa78632dc81dac228cbfdde3..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_023
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="SO2",              ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=2.0E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E-9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=2.0,                ! Dry deposition (gases) - D
- PHENRY=100000.0,             ! Dry deposition (gases) - Henrys const.
- PF0=0,                       ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=64.0,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_024 b/tests/default_options/SPECIES/SPECIES_024
index 92284f313318b9049fd380055b1bb98b2af05b3f..703e74550143bc4a6cfe8008578c9e4ba06c747d 100644
--- a/tests/default_options/SPECIES/SPECIES_024
+++ b/tests/default_options/SPECIES/SPECIES_024
@@ -10,7 +10,6 @@
  PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
  PDQUER=0.0,                  ! Dry deposition (particles) - dquer
  PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
  PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
  PRELDIFF=-9.9,               ! Dry deposition (gases) - D
  PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
diff --git a/tests/default_options/SPECIES/SPECIES_025 b/tests/default_options/SPECIES/SPECIES_025
deleted file mode 100644
index f41666a29cdb623ab9294586dadcf8e7cfc3d4e7..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_025
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="AERO-TRACE",       ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=1.0,             ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=1.0,             ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=0.9,               ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=0.1,                ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=1400.0,             ! Dry deposition (particles) - rho
- PDQUER=2.5E-07,              ! Dry deposition (particles) - dquer
- PDSIGMA=1.25,                ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_026 b/tests/default_options/SPECIES/SPECIES_026
deleted file mode 100644
index da37f55e982a184134c86ce41f8f5ef602c09bd6..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_026
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="CH4",              ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=16.0,           ! molweight
- POHCCONST=9.65E-20,          ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=1082.0,            ! OH Reaction rate - D [K]
- POHNCONST=2.58,              ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_027 b/tests/default_options/SPECIES/SPECIES_027
deleted file mode 100644
index 6265f9ba6f1004b7486207052a0b85a9075cb220..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_027
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="C2H6",             ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=-0.9E-9,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=-9.9,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=-9.9,               ! Dry deposition (gases) - D
- PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
- PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=30.0,           ! molweight
- POHCCONST=15.2E-18,          ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=498.0,             ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_028 b/tests/default_options/SPECIES/SPECIES_028
deleted file mode 100644
index 4e92447c237978dd059312b51173d651e52e70a0..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_028
+++ /dev/null
@@ -1,7 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="C3H8            ",
- PWEIGHTMOLAR=  44.0000000    ,
- POHCCONST=  1.55-E17,
- POHDCONST=  61.0000000    ,
- POHNCONST=  2.00000000    ,
- /
diff --git a/tests/default_options/SPECIES/SPECIES_031 b/tests/default_options/SPECIES/SPECIES_031
deleted file mode 100644
index 701f2866389a6e527e4bb25a0bbab198823cca6c..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_031
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="PCB28",            ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=3.5E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=4.3,                ! Dry deposition (gases) - D
- PHENRY=3.1,                  ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=257.54,         ! molweight
- POHCCONST=1.07E-11,          ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=1203.0,            ! OH Reaction rate - D [K]
- POHNCONST=0.0,               ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_034 b/tests/default_options/SPECIES/SPECIES_034
deleted file mode 100644
index 5e7ebe277313703828a58db941f89e68058d8757..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_034
+++ /dev/null
@@ -1,22 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="G-HCH",            ! Tracer name
- PDECAY=-9.9,                 ! Species half life
- PWETA_GAS=3.5E-05,           ! Below-cloud scavenging (gases) - A (weta_gas)
- PWETB_GAS=0.62,              ! Below-cloud scavenging (gases) - B (wetb_gas)
- PCRAIN_AERO=-9.9,            ! Below-cloud scavenging (particles) - Crain (crain_aero)
- PCSNOW_AERO=-9.9,            ! Below-cloud scavenging (particles) - Csnow (csnow_aero)
- PCCN_AERO=-9.9,              ! In-cloud scavenging (particles) - CCNeff (ccn_aero)
- PIN_AERO=-9.9,               ! In-cloud scavenging (particles) - INeff (in_aero)
- PDENSITY=-0.9E+9,            ! Dry deposition (particles) - rho
- PDQUER=0.0,                  ! Dry deposition (particles) - dquer
- PDSIGMA=0.0,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                      ! Dry deposition (particles) - ndia
- PDRYVEL=-9.99,               ! Alternative: dry deposition velocity
- PRELDIFF=4.3,                ! Dry deposition (gases) - D
- PHENRY=422.0,                ! Dry deposition (gases) - Henrys const.
- PF0=0.1,                     ! Dry deposition (gases) - f0 (reactivity)
- PWEIGHTMOLAR=290.83,         ! molweight
- POHCCONST=6.21E-11,          ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=1203.0,            ! OH Reaction rate - D [K]
- POHNCONST=2.00,              ! OH Reaction rate - N (no unit)
- /
diff --git a/tests/default_options/SPECIES/SPECIES_040 b/tests/default_options/SPECIES/SPECIES_040
index c84cd113fa009123a28c09b5833f8595401d7c77..a3610c4a51640c8c7be40b741e1fc3c1c199c625 100644
--- a/tests/default_options/SPECIES/SPECIES_040
+++ b/tests/default_options/SPECIES/SPECIES_040
@@ -10,15 +10,14 @@
  PDENSITY=1000.0,             ! Dry deposition (particles) - rho
  PDQUER=50.0E-06,             ! Dry deposition (particles) - dquer (equivalent diameter for shape)
  PDSIGMA=3.3,                 ! Dry deposition (particles) - dsig
- PNDIA=1,                     ! Dry deposition (particles) - ndia
  PDRYVEL=-9.9,                ! Alternative: dry deposition velocity
  PRELDIFF=-9.9,               ! Dry deposition (gases) - D
  PHENRY=-0.9E-9,              ! Dry deposition (gases) - Henrys const.
  PF0=-9,                      ! Dry deposition (gases) - f0 (reactivity)
  PWEIGHTMOLAR=-9.9,           ! molweight
- POHCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
- POHDCONST=-9.9,              ! OH Reaction rate - D [K]
- POHNCONST=2.0,               ! OH Reaction rate - C [cm^3/molecule/sec]
+ PCCONST=-0.9E-9,           ! OH Reaction rate - C [cm^3/molecule/sec]
+ PDCONST=-9.9,              ! OH Reaction rate - D [K]
+ PNCONST=2.0,               ! OH Reaction rate - C [cm^3/molecule/sec]
  PSHAPE=1,                    ! 0 for sphere, 1 any shape (defined by axes PLA,PIA,PSA), 2-cylinder, 3-cube, 4-tetrahedron, 5-octahedron, 6-ellipsoid
  PASPECTRATIO=20.0            ! Aspect ratio of cylinders: works for PSHAPE=2 only
  PLA=940,                     ! Longest axis in micrometer (Bagheri & Bonadonna 2016): only for PSHAPE=1
diff --git a/tests/default_options/SPECIES/SPECIES_050 b/tests/default_options/SPECIES/SPECIES_050
deleted file mode 100755
index 53b8ee977e864d367d7be18b1c6966afb315c96d..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_050
+++ /dev/null
@@ -1,25 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="DUST-1um        ",
- PDECAY= -999.900024    ,
- PWETA_GAS= -9.89999993E-09,
- PWETB_GAS=  0.00000000    ,
- PCRAIN_AERO=  1.00000000    ,
- PCSNOW_AERO=  1.00000000    ,
- PCCN_AERO= 0.150000000    ,
- PIN_AERO= 0.020000000    ,
- PRELDIFF= -9.89999962    ,
- PHENRY=  9.99999972E-10,
- PF0=  0.00000000    ,
- PDENSITY=  2650.00000    ,
- PDQUER=  9.99999997E-07,
- PDSIGMA=  1.10000002    ,
- PDRYVEL= -9.98999977    ,
- PWEIGHTMOLAR= -999.900024    ,
- POHCCONST= -9.98999977    ,
- POHDCONST= -9.89999993E-09,
- POHNCONST=  2.00000000    ,
- PAREA_DOW= 7*1.00000000      ,
- PAREA_HOUR= 24*1.00000000      ,
- PPOINT_DOW= 7*1.00000000      ,
- PPOINT_HOUR= 24*1.00000000      ,
- /
diff --git a/tests/default_options/SPECIES/SPECIES_051 b/tests/default_options/SPECIES/SPECIES_051
deleted file mode 100755
index 0a88284ce590ffc641ab5099006322b7ad090ae9..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/SPECIES_051
+++ /dev/null
@@ -1,25 +0,0 @@
-&SPECIES_PARAMS
- PSPECIES="DUST-5um        ",
- PDECAY= -999.900024    ,
- PWETA_GAS= -9.89999993E-09,
- PWETB_GAS=  0.00000000    ,
- PCRAIN_AERO=  1.00000000    ,
- PCSNOW_AERO=  1.00000000    ,
- PCCN_AERO= 0.150000000    ,
- PIN_AERO= 0.020000000    ,
- PRELDIFF= -9.89999962    ,
- PHENRY=  9.99999972E-10,
- PF0=  0.00000000    ,
- PDENSITY=  2650.00000    ,
- PDQUER=  4.99999987E-06,
- PDSIGMA=  1.10000002    ,
- PDRYVEL= -9.98999977    ,
- PWEIGHTMOLAR= -999.900024    ,
- POHCCONST= -9.98999977    ,
- POHDCONST= -9.89999993E-09,
- POHNCONST=  2.00000000    ,
- PAREA_DOW= 7*1.00000000      ,
- PAREA_HOUR= 24*1.00000000      ,
- PPOINT_DOW= 7*1.00000000      ,
- PPOINT_HOUR= 24*1.00000000      ,
- /
diff --git a/tests/default_options/SPECIES/specoverview.f90 b/tests/default_options/SPECIES/specoverview.f90
deleted file mode 100644
index 065b5721ad42ca7a478b2491d88332c11529ff49..0000000000000000000000000000000000000000
--- a/tests/default_options/SPECIES/specoverview.f90
+++ /dev/null
@@ -1,115 +0,0 @@
-!**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
-! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
-! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
-!                                                                     *
-! This file is part of FLEXPART.                                      *
-!                                                                     *
-! FLEXPART is free software: you can redistribute it and/or modify    *
-! it under the terms of the GNU General Public License as published by*
-! the Free Software Foundation, either version 3 of the License, or   *
-! (at your option) any later version.                                 *
-!                                                                     *
-! FLEXPART is distributed in the hope that it will be useful,         *
-! but WITHOUT ANY WARRANTY; without even the implied warranty of      *
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       *
-! GNU General Public License for more details.                        *
-!                                                                     *
-! You should have received a copy of the GNU General Public License   *
-! along with FLEXPART.  If not, see <http://www.gnu.org/licenses/>.   *
-!**********************************************************************
-  implicit none
-
-  character(len=11) :: speciesfn
-  character(len=3)  :: aspec
-  character(len=16) :: pspecies
-  real :: pdecay, pweta_gas, pwetb_gas, preldiff, phenry, pf0, pdensity, pdquer
-  real :: pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst
-  real :: pcrain_aero, pcsnow_aero, pccn_aero, pin_aero
-  integer :: readerror, unitspecies, specnumber
-
-! declare namelist
-  namelist /species_params/ &
-       pspecies, pdecay, pweta_gas, pwetb_gas, &
-       pcrain_aero, pcsnow_aero, pccn_aero, pin_aero, &
-       preldiff, phenry, pf0, pdensity, pdquer, &
-       pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst 
-
-  unitspecies=4
-
-  write(*,*) '    Species   |       |   WetDep(gas)   |    DryDep(gas)   |WetDep(below-C)| WetDep(in-C)|'//& 
-             '     DryDepo(particles)  Altern| Radioact.  |     OH Reaction      |'
-
-  write(*,*) '    Name      |molwght| A          B    | D    H        f0 | Crain   Csnow |  ccn    in  |' //&
-             '   rho    dquer    dsig    vd  | Halflife[s]|   C**     D[T]  N*** |'
-
-  write(*,*) '--------------|-------|-----------------|------------------|---------------|-------------|'//&
-             '-------------------------------|------------|----------------------|'
-
-
-! write(*,*) '    Specie    | Radioact.  | WetDep(gas)     |WetDep(below-C)| WetDep(in-C)|     DryDepo(gas)  |'//& 
-!            '     DryDepo(particles)  Altern|       |     OH Reaction      |'
-! write(*,*) '    Name      | Halflife[s]|  A         B    |  Crain  Csnow | ccn    in   |   D      H    f0  |' //&
-!            '   rho    dquer    dsig    vd  |molwght|   C**     D[T]  N*** |'
-! write(*,*) '--------------|------------|-----------------|---------------|-------------|-------------------|'//&
-!            '-------------------------------|-------|----------------------|'
-
-  do specnumber=1,100
-  
-  write (aspec,'(i0.3)') specnumber
-  speciesfn='SPECIES_'//aspec
- 
-! write(*,*) 'Processing: ',speciesfn
-
-  pspecies="" ! read failure indicator value
-  pdecay=-9.9
-  pweta_gas=-0.9E-09
-  pwetb_gas=0.0
-  pcrain_aero=-9.9
-  pcsnow_aero=-9.9
-  pccn_aero=-9.9
-  pin_aero=-9.9
-  preldiff=-9.9
-  phenry=0.0
-  pf0=0.0
-  pdensity=-0.9E09
-  pdquer=0.0
-  pdsigma=0.0
-  pdryvel=-9.99
-  pohcconst=-9.9
-  pohdconst=-9.9
-  pohnconst=2.0
-  pweightmolar=-9.9
-
-! Open the SPECIES file and read species names and properties
-!************************************************************
-  open(unitspecies,file=speciesfn,status='old',form='formatted',err=998)
-  read(unitspecies,species_params,err=998)
-  close(unitspecies)
-  
-  write(*,45) specnumber,' ',pspecies,'|',pweightmolar,'|',pweta_gas,' ',pwetb_gas,'|', &
-              preldiff,' ',phenry,' ',pf0,'|', &
-              pcrain_aero,' ',pcsnow_aero,'|',pccn_aero,' ',pin_aero,'|', &
-              pdensity,pdquer,pdsigma,pdryvel,'|',pdecay,'|',pohcconst,pohdconst,pohnconst,'|'
-
-45 format(i3,a1,a11,a1,f7.1,a1,e8.1,a1,f8.2,a1, &
-          f4.1,a1,e8.1,a1,f4.1,a1, &
-          f7.1,a1,f7.1,a1,f6.1,a1,f6.1,a1, &
-          e8.1,e9.1,f7.1,f7.2,a1,f12.1,a1,e8.1,f7.1,f7.1,a1)
-
-!  write(*,45) specnumber,' ',pspecies,'|',pdecay,'|',pweta_gas,' ',pwetb_gas,'|',pcrain_aero,' ', &
-!            pcsnow_aero,'|',pccn_aero,' ',pin_aero,'|',preldiff,' ',phenry,' ',pf0,'|', &
-!             pdensity,pdquer,pdsigma,pdryvel,'|',pweightmolar,'|',pohcconst,pohdconst,pohnconst,'|'
-
-!5 format(i3,a1,a11,a1,f12.1,a1,e8.1,a1,f8.2,a1,f7.1,a1,f7.1,a1,f6.1,a1,f6.1,a1,f5.1,a1,e8.1,a1,f4.1,a1, &
-!         e8.1,e9.1,f7.1,f7.2,a1,f7.1,a1,e8.1,f7.1,f7.1,a1)
-            
-998 continue
-enddo
-
-write(*,*) '** unit [cm^3/molec/s] (in FLEXPART version 9.2 and below this had unit [cm3/s], note the unit is now changed!)'
-write(*,*) '*** no unit'
-
- print*,'rho: density'
-
-end