diff --git a/testcases/cyclone_example/cyclone_example.txt b/testcases/cyclone_example/cyclone_example.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b38bfef642ef3e498137ca790fa392b2d085fc33
--- /dev/null
+++ b/testcases/cyclone_example/cyclone_example.txt
@@ -0,0 +1,4 @@
+This is a testcase reproducing the cyclone base case of Dimits 2000
+Adiabatic electrons, s-alpha geometry, gradlnN = 2.22, gradlnT = 6.96
+With a small P,J=4,2 polynomial basis, one should observe the secondary instability (KHI) at t~50R/cs.
+The saturated heat flux should be located around Qx ~ 30, i.e. Qx/QGB ~ 2 which is close to Dimits results.
diff --git a/testcases/cyclone_example/fort.90 b/testcases/cyclone_example/fort.90
new file mode 100644
index 0000000000000000000000000000000000000000..d562465a47ad3fcff4858ddad9ea05cd9b707fec
Binary files /dev/null and b/testcases/cyclone_example/fort.90 differ
diff --git a/testcases/kobayashi_2015_linear_results.m b/testcases/kobayashi_2015_linear_results.m
deleted file mode 100644
index 82f339125f78966b0d059746be9b56d8eaa292d0..0000000000000000000000000000000000000000
--- a/testcases/kobayashi_2015_linear_results.m
+++ /dev/null
@@ -1,19 +0,0 @@
-% results for blue triangles in Kobayashi 2015
-% x_ = [0.06 0.4 0.6];
-% y_ = [0.0 0.1 0.0];
-% plot(x_,y_,'^b','DisplayName','Kobayashi et al. 2015');
-
-
-% results for red squares in Kobayashi 2015
-% x_ = [0.065 0.15 0.35];
-% y_ = [0.0   0.15 0.0];
-% plot(x_,y_,'sr','DisplayName','Kobayashi et al. 2015');
-
-
-% results for green triangles in Kobayashi 2015
-x_ = [0.06  0.5  1.8];
-y_ = [0.0   0.2  0.0];
-plot(x_,y_,'dg','DisplayName','Kobayashi et al. 2015');
-
-
-
diff --git a/testcases/Hallenbert.m b/testcases/matlab_testscripts/Hallenbert.m
similarity index 100%
rename from testcases/Hallenbert.m
rename to testcases/matlab_testscripts/Hallenbert.m
diff --git a/testcases/benchmark_HeLaZ_gene_transport_zpinch.m b/testcases/matlab_testscripts/benchmark_HeLaZ_gene_transport_zpinch.m
similarity index 100%
rename from testcases/benchmark_HeLaZ_gene_transport_zpinch.m
rename to testcases/matlab_testscripts/benchmark_HeLaZ_gene_transport_zpinch.m
diff --git a/testcases/benchmark_HeLaZ_molix.m b/testcases/matlab_testscripts/benchmark_HeLaZ_molix.m
similarity index 100%
rename from testcases/benchmark_HeLaZ_molix.m
rename to testcases/matlab_testscripts/benchmark_HeLaZ_molix.m
diff --git a/testcases/benchmark_linear_1D_entropy_mode.m b/testcases/matlab_testscripts/benchmark_linear_1D_entropy_mode.m
similarity index 100%
rename from testcases/benchmark_linear_1D_entropy_mode.m
rename to testcases/matlab_testscripts/benchmark_linear_1D_entropy_mode.m
diff --git a/testcases/cyclone_test_case.m b/testcases/matlab_testscripts/cyclone_test_case.m
similarity index 100%
rename from testcases/cyclone_test_case.m
rename to testcases/matlab_testscripts/cyclone_test_case.m
diff --git a/testcases/linear_1D_entropy_mode.m b/testcases/matlab_testscripts/linear_1D_entropy_mode.m
similarity index 100%
rename from testcases/linear_1D_entropy_mode.m
rename to testcases/matlab_testscripts/linear_1D_entropy_mode.m
diff --git a/testcases/linear_damping.m b/testcases/matlab_testscripts/linear_damping.m
similarity index 100%
rename from testcases/linear_damping.m
rename to testcases/matlab_testscripts/linear_damping.m
diff --git a/testcases/miller_example/fort_00.90 b/testcases/miller_example/fort_00.90
new file mode 100644
index 0000000000000000000000000000000000000000..6958e7ad349208316d3f2e9cb71f5bb53d47b7f5
Binary files /dev/null and b/testcases/miller_example/fort_00.90 differ
diff --git a/fort.90 b/testcases/zpinch_example/fort.90
similarity index 76%
rename from fort.90
rename to testcases/zpinch_example/fort.90
index ae9af96cf7e62ca4cdffaf1472989319302529d2..f769f6b8fb6a2e041fc5dde3ce1edaf7c39810f0 100644
--- a/fort.90
+++ b/testcases/zpinch_example/fort.90
@@ -1,7 +1,7 @@
 &BASIC
   nrun   = 100000000
-  dt     = 0.01
-  tmax   = 400
+  dt     = 0.005
+  tmax   = 100
   maxruntime = 356400
 /
 &GRID
@@ -10,23 +10,23 @@
   pmaxi  = 4
   jmaxi  = 2
   Nx     = 128
-  Lx     = 120
-  Ny     = 40
+  Lx     = 200
+  Ny     = 48
   Ly     = 60
   Nz     = 1
   SG     = .f.
 /
 &GEOMETRY
   geom   = 'Z-pinch'
-  q0     = 1.4
+  q0     = 0
   shear  = 0
-  eps    = 0.18
+  eps    = 0
 /
 &OUTPUT_PAR
   nsave_0d = 10
   nsave_1d = -1
   nsave_2d = -1
-  nsave_3d = 20
+  nsave_3d = 100
   nsave_5d = 1000
   write_doubleprecision = .f.
   write_gamma = .t.
@@ -42,9 +42,9 @@
 &MODEL_PAR
   ! Collisionality
   CLOS    = 0
-  NL_CLOS = 0
+  NL_CLOS = -1
   LINEARITY = 'nonlinear'
-  KIN_E   = .f.
+  KIN_E   = .t.
   mu_x    = 1.0
   mu_y    = 1.0
   N_HD    = 4
@@ -58,22 +58,23 @@
   sigma_i = 1
   q_e     = -1
   q_i     = 1
-  K_n     = 2.22
-  K_T     = 6.96
-  K_E     = 0
+  K_Ne    = 2.22
+  K_Te    = 6.96
+  K_Ni    = 2.22
+  K_Ti    = 6.96
   GradB   = 1
   CurvB   = 1
   lambdaD = 0
+  beta    = 1e-4
 /
 &COLLISION_PAR
   collision_model = 'SG' !DG/SG/PA/LD (dougherty, sugama, pitch angle, landau)
   gyrokin_CO      = .false.
   interspecies    = .true.
-  mat_file        = 'iCa/gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
-!  mat_file        = 'iCa/gk_pitchangle_8_P_20_J_10_N_150_kpm_8.0.h5'
+  mat_file        = 'gk_sugama_P_20_J_10_N_150_kpm_8.0.h5'
 /
 &INITIAL_CON
-  INIT_OPT    = 'ppj'
+  INIT_OPT    = 'phi'
   ACT_ON_MODES       = 'donothing'
   init_background  = 0
   init_noiselvl = 0.00005