diff --git a/matlab/TCV/tcv_requests_mapping.m b/matlab/TCV/tcv_requests_mapping.m
index 1dd71bbe8451dd9f6b5055ebe9e4895091b05d6f..3d64162f25f53f02e3df6d11188da4c418b235dd 100644
--- a/matlab/TCV/tcv_requests_mapping.m
+++ b/matlab/TCV/tcv_requests_mapping.m
@@ -333,12 +333,12 @@ switch lower(data_request)
   mapping.timedim = 2;
   mapping.label = 'R B_\phi';
   mapping.method = 'switchcase';
- case 'r_contour'
-  mapping.timedim = 2;
-  mapping.method = 'tdiliuqe';
-  mapping.expression = '\results::r_contour';
-  mapping.expression = '\tcv_shot::top.results.equil_1.results:r_rho'; % several flux surfaces R coordinates (irho,itheta,t)
-  mapping.expression = 'tcv_eq(''''r_rho'''',''''LIUQE.M'''')';
+% $$$  case 'r_contour'   % r_rho not yet implemented
+% $$$   mapping.timedim = 2;
+% $$$   mapping.method = 'tdiliuqe';
+% $$$   mapping.expression = '\results::r_contour';
+% $$$   mapping.expression = '\tcv_shot::top.results.equil_1.results:r_rho'; % several flux surfaces R coordinates (irho,itheta,t)
+% $$$   mapping.expression = 'tcv_eq(''''r_rho'''',''''LIUQE.M'''')';
  case 'r_contour_edge'
   mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
@@ -461,12 +461,12 @@ switch lower(data_request)
   mapping.expression = '\tcv_shot::top.results.equil_1.results:w_mhd';
   mapping.expression = 'tcv_eq(''''w_mhd'''',''''LIUQE.M'''')';
 % $$$   end
- case 'z_contour'
-  mapping.timedim = 2;
-  mapping.method = 'tdiliuqe';
-  mapping.expression = '\results::z_contour';
-  mapping.expression = '\tcv_shot::top.results.equil_1.results:z_rho'; % several flux surfaces Z coordinates (irho,itheta,t)
-  mapping.expression = 'tcv_eq(''''z_rho'''',''''LIUQE.M'''')';
+% $$$  case 'z_contour'   % z_rho not yet implemented
+% $$$   mapping.timedim = 2;
+% $$$   mapping.method = 'tdiliuqe';
+% $$$   mapping.expression = '\results::z_contour';
+% $$$   mapping.expression = '\tcv_shot::top.results.equil_1.results:z_rho'; % several flux surfaces Z coordinates (irho,itheta,t)
+% $$$   mapping.expression = 'tcv_eq(''''z_rho'''',''''LIUQE.M'''')';
  case 'z_contour_edge'
   mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
diff --git a/matlab/run_gdat_tests.m b/matlab/run_gdat_tests.m
index e17c73af0bdef40f79836227c11b49bf0b64ea9b..4d75670474c18aaab7b3111e0fcde460134fa17e 100644
--- a/matlab/run_gdat_tests.m
+++ b/matlab/run_gdat_tests.m
@@ -6,6 +6,7 @@ function [passed,results] = run_gdat_tests(test_case)
 if nargin==0 || isempty(test_case)
   test_case = 'basic'; % default
 end
+test_case = lower(test_case);
 
 %% Import some classes we need
 import matlab.unittest.selectors.HasTag;
@@ -25,19 +26,19 @@ switch test_case
   case 'all'
     suite = suite_all; % run all
   case 'basic'
-    s = ~HasTag('Slow');
+    s = ~HasTag('slow');
     suite = suite_all.selectIf(s);
-  case 'IMAS'
-    s = HasTag('IMAS');
+  case 'imas'
+    s = HasTag('imas');
     suite = suite_all.selectIf(s);
-  case 'TCV'
+  case 'tcv'
 
     s = HasName(ContainsSubstring('TCV'));
     suite = suite_all.selectIf(s);
-  case 'AUG'
-    s = HasName(ContainsSubstring('AUG'));
+  case 'aug'
+    s = HasName(ContainsSubstring('aug'));
     suite = suite_all.selectIf(s);
-    
+
   otherwise
     error('not yet implemented')
 end
@@ -64,5 +65,3 @@ else
   end
   passed = false;
 end
-
-end