diff --git a/run/control/CONTROL_CERA.testgrid b/run/control/CONTROL_CERA.testgrid
deleted file mode 100644
index a471d4da70fea299cf0a254c56723178eed5bc40..0000000000000000000000000000000000000000
--- a/run/control/CONTROL_CERA.testgrid
+++ /dev/null
@@ -1,23 +0,0 @@
-START_DATE
-DTIME 3
-TYPE AN AN AN AN AN AN AN AN
-TIME 00 03 06 09 12 15 18 21
-STEP 00 00 00 00 00 00 00 00
-ACCTYPE FC
-ACCTIME 18
-ACCMAXSTEP 24
-CLASS EP
-STREAM ENDA
-NUMBER 0
-GRID 2000
-LEFT 30000
-LOWER 40000
-UPPER 50000
-RIGHT 40000
-LEVELIST 88/to/91
-RESOL 106
-ETA 1
-ADDPAR 27/28/173/186/187/188/235/139/39
-CWC 1
-PREFIX CE
-ECTRANS 1
diff --git a/run/control/CONTROL_EA5.highres b/run/control/CONTROL_EA5.highres
deleted file mode 100644
index b08103e1822b0db54368c5e08a6faac008e1e490..0000000000000000000000000000000000000000
--- a/run/control/CONTROL_EA5.highres
+++ /dev/null
@@ -1,22 +0,0 @@
-START_DATE
-DTIME 1
-TYPE AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN
-TIME 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-STEP 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-ACCTYPE FC
-ACCTIME 06/18
-ACCMAXSTEP 12
-CLASS EA
-STREAM OPER
-GRID 281.25
-LEFT -100000
-LOWER 00000
-UPPER 60000
-RIGHT 60000
-LEVELIST 1/to/137
-RESOL 639
-ETA 1
-FORMAT GRIB2
-ADDPAR /186/187/188/235/139/39
-PREFIX EA
-ECTRANS 1
diff --git a/run/control/CONTROL_EA5.testgrid b/run/control/CONTROL_EA5.testgrid
deleted file mode 100644
index 439f9b6074e321dff96936368e614dbce7226769..0000000000000000000000000000000000000000
--- a/run/control/CONTROL_EA5.testgrid
+++ /dev/null
@@ -1,22 +0,0 @@
-START_DATE
-DTIME 1
-TYPE AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN AN
-TIME 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23
-STEP 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-ACCTYPE FC
-ACCTIME 06/18
-ACCMAXSTEP 12
-CLASS EA
-STREAM OPER
-GRID 1000
-LEFT -5000
-LOWER 10000
-UPPER 20000
-RIGHT 5000
-LEVEL 137
-LEVELIST 100/to/137
-RESOL 159
-ETA 1
-ADDPAR 186/187/188/235/139/39
-PREFIX EA
-ECTRANS 1
diff --git a/run/control/CONTROL_EI.testgrid b/run/control/CONTROL_EI.testgrid
deleted file mode 100644
index 6cddcfce7abd45a2017e1efd8cc5d0289ff27593..0000000000000000000000000000000000000000
--- a/run/control/CONTROL_EI.testgrid
+++ /dev/null
@@ -1,21 +0,0 @@
-START_DATE
-DTIME 3
-TYPE AN FC FC FC AN FC FC FC
-TIME 00 00 00 00 12 12 12 12
-STEP 00 03 06 09 00 03 06 09
-ACCTYPE FC
-ACCTIME 00/12
-ACCMAXSTEP 12
-CLASS EI
-STREAM OPER
-GRID 1000
-LEFT -5000
-LOWER 30000
-UPPER 40000
-RIGHT 5000
-LEVELIST 1/to/60
-RESOL 159
-GAUSS 1
-ADDPAR 186/187/188/235/139/39
-PREFIX EI
-ECTRANS 1
diff --git a/source/pythontest/TestEcFlexpart.py b/source/pythontest/TestEcFlexpart.py
deleted file mode 100644
index 49f5161fa598159d230bc9894f54f3387e97d1a6..0000000000000000000000000000000000000000
--- a/source/pythontest/TestEcFlexpart.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-
-import sys
-import os
-import inspect
-import pytest
-
-sys.path.append('../python')
-import _config
-from classes.EcFlexpart import EcFlexpart
-from classes.ControlFile import ControlFile
-from mods.tools import silent_remove
-
-class TestEcFlexpart():
- '''
- '''
-
- def test_write_namelist(self):
- import filecmp
-
- control_file = os.path.join(_config.PATH_TEST_DIR,
- 'TestData',
- 'CONTROL.temp')
- c = ControlFile(control_file)
- flexpart = EcFlexpart(c)
-
- c.inputdir = 'TestData'
-
- # comparison file
- testfile = os.path.join(_config.PATH_TEST_DIR,
- 'TestData',
- 'convert.nl.test')
-
- # create
- flexpart.write_namelist(c)
-
- finalfile = os.path.join(c.inputdir, _config.FILE_NAMELIST)
- assert filecmp.cmp(testfile, finalfile, shallow=False)
-
- # delete test file
- silent_remove(finalfile)
-
- def test_retrieve(self):
- # not sure how to check
- assert True == True
-
-
-# these functions should test the output and compare the results with an output
-# of the old version and check if there are no differences!!!
-# also check for errors?! Or check if it works for alle datasets and private public etc
-
- # - process_output
- # - create
- # - deacc_fluxes
diff --git a/source/pythontest/testecmwfapi.py b/source/pythontest/testecmwfapi.py
deleted file mode 100644
index 41cb1700c9e4e60b3fcf2be7cbafc09563147f69..0000000000000000000000000000000000000000
--- a/source/pythontest/testecmwfapi.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from ecmwfapi import ECMWFDataServer
-
-server = ECMWFDataServer()
-
-server.retrieve({
- 'dataset' : "interim",
- 'time' : "00",
- 'date' : "2013-09-01/to/2013-09-30",
- 'step' : "0",
- 'type' : "an",
- 'levtype' : "sfc",
- 'param' : "165.128/41.128",
- 'grid' : "0.75/0.75",
- 'target' : "interim201309.grib"
-})
diff --git a/test/Regression/Mars_request/7.1/EA5.highres_mr.csv b/test/Regression/Mars_request/7.1/EA5.highres_mr.csv
deleted file mode 100644
index 4326d8c4e8822db73a5d18ee910621be0fbae439..0000000000000000000000000000000000000000
--- a/test/Regression/Mars_request/7.1/EA5.highres_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 60.0/-100.0/0.0/60.0, None, 20181029/to/20181031, 1, , 0.25/0.25, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 799, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.140493.140494.grb, 06/18, FC
-1, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 60/to/137, ML, EA, OFF, T/Q/U/V/77, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.140493.140494.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 24, 60.0/-100.0/0.0/60.0, None, 20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 160/27/28/244, , 799, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.140493.140494.grb, 00, AN
-3, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.140493.140494.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 60.0/-100.0/0.0/60.0, None, 20181030/to/20181030, 1, , 0.25/0.25, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 799, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.140493.140494.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/test/Regression/Mars_request/7.1/EA5.public_mr.csv b/test/Regression/Mars_request/7.1/EA5.public_mr.csv
deleted file mode 100644
index 240d159658c24129f04df5e005c7b15ab2004f1f..0000000000000000000000000000000000000000
--- a/test/Regression/Mars_request/7.1/EA5.public_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 213, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.140612.140613.grb, 06/18, FC
-1, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1/to/137, ML, EA, OFF, T/Q/U/V/77, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.140612.140613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160/27/28/244, , 213, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.140612.140613.grb, 00, AN
-3, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.140612.140613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 24, 75.0/-15.0/30.0/45.0, ERA5, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 213, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.140612.140613.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
diff --git a/test/Regression/Mars_request/7.1/EA5_mr.csv b/test/Regression/Mars_request/7.1/EA5_mr.csv
deleted file mode 100644
index 60dca6ebbd9beaa5b3a2783fd0a44982507e6469..0000000000000000000000000000000000000000
--- a/test/Regression/Mars_request/7.1/EA5_mr.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-request_number, accuracy, area, dataset, date, expver, gaussian, grid, levelist, levtype, marsclass, number, param, repres, resol, step, stream, target, time, type
-1, 16, 75.0/-25.0/10.0/60.0, None, 20181029/to/20181031, 1, , 1.0/1.0, 1, SFC, EA, OFF, LSP/CP/SSHF/EWSS/NSSS/SSR, , 159, 1/to/12/by/1, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//FCOG_acc_SL.20181029.140555.140556.grb, 06/18, FC
-1, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 130/to/137, ML, EA, OFF, T/Q/U/V/77, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__ML.20181030.140555.140556.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-2, 16, 75.0/-25.0/10.0/60.0, None, 20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 160/27/28/244, , 159, 000, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//OG_OROLSM__SL.20181030.140555.140556.grb, 00, AN
-3, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , OFF, 1, ML, EA, OFF, LNSP, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANSH__SL.20181030.140555.140556.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN
-4, 16, 75.0/-25.0/10.0/60.0, None, 20181030/to/20181030, 1, , 1.0/1.0, 1, SFC, EA, OFF, 141/151/164/165/166/167/168/129/172/186/187/188/235/139/39, , 159, 00, OPER, /raid60/nas/tmc/Anne/Interpolation/flexextract/flex_extract_v7.1/test/Regression/Mars_request/./7.1//ANOG__SL.20181030.140555.140556.grb, 00/01/02/03/04/05/06/07/08/09/10/11/12/13/14/15/16/17/18/19/20/21/22/23, AN