diff --git a/tests/estimation/fs2000_stochastic_singularity_xfail.mod b/tests/estimation/fs2000_stochastic_singularity_xfail.mod
index cdd977d07fcb74f03e7c93dfc13572e944362368..a84cc0ce1cb01bf6b892ccd340a9a6c5b84c15f4 100644
--- a/tests/estimation/fs2000_stochastic_singularity_xfail.mod
+++ b/tests/estimation/fs2000_stochastic_singularity_xfail.mod
@@ -64,7 +64,7 @@ var e_junk; stderr 0.005;
 end;
 
 stoch_simul(order=1,periods=300,irf=0,nomoments) k y c;
-datatomfile('fsdat_simul_collinear', char('k','y','c'));
+datatomfile('fsdat_simul_collinear', {'k'; 'y'; 'c'});
 
 estimated_params;
 alp, beta_pdf, 0.356, 0.02;
diff --git a/tests/filter_step_ahead/fs2000_filter_step_ahead_ML.mod b/tests/filter_step_ahead/fs2000_filter_step_ahead_ML.mod
index 9de6f5299dee3c5e63ca1942c1ba0e9957a372e5..a7ddcecbb22dac07d0542af6be63a86e2ab55569 100644
--- a/tests/filter_step_ahead/fs2000_filter_step_ahead_ML.mod
+++ b/tests/filter_step_ahead/fs2000_filter_step_ahead_ML.mod
@@ -118,4 +118,4 @@ estimation(order=1, datafile='../fs2000/fsdat_simul', nobs=192, loglinear, filte
  */
 
 //stoch_simul(periods=200, order=1);
-//datatomfile('fsdat_simul', char('gy_obs', 'gp_obs'));
+//datatomfile('fsdat_simul', {gy_obs'; 'gp_obs'});
diff --git a/tests/filter_step_ahead/fs2000_filter_step_ahead_bayesian.mod b/tests/filter_step_ahead/fs2000_filter_step_ahead_bayesian.mod
index 9e1815adaa0a3d853de635b7129fed189628b0ce..e977f10e12dbb39a93fc3de2ba7eb1be3402ed80 100644
--- a/tests/filter_step_ahead/fs2000_filter_step_ahead_bayesian.mod
+++ b/tests/filter_step_ahead/fs2000_filter_step_ahead_bayesian.mod
@@ -124,4 +124,4 @@ estimation(order=1, datafile='../fs2000/fsdat_simul', nobs=192, loglinear, mh_re
  */
 
 //stoch_simul(periods=200, order=1);
-//datatomfile('fsdat_simul', char('gy_obs', 'gp_obs'));
+//datatomfile('fsdat_simul', {'gy_obs'; 'gp_obs'});
diff --git a/tests/fs2000/fs2000_missing_data.mod b/tests/fs2000/fs2000_missing_data.mod
index 2ef89c2b8ed29d679c708afb80fe7b39b9a4b2f3..3a0a77d4f3931a9390c10e5ff430fd828a75333e 100644
--- a/tests/fs2000/fs2000_missing_data.mod
+++ b/tests/fs2000/fs2000_missing_data.mod
@@ -90,4 +90,4 @@ estimation(order=1, datafile=fsdat_simul_missing_obs, nobs=192, loglinear, mh_re
  */
 
 //stoch_simul(periods=200, order=1);
-//datatomfile('fsdat_simul', char('gy_obs', 'gp_obs'));
+//datatomfile('fsdat_simul', {'gy_obs'; 'gp_obs'});
diff --git a/tests/fs2000/fs2000a.mod b/tests/fs2000/fs2000a.mod
index 210417e4f6e73f4d9ec7f0d0df79b9f917a5d67a..bc9d31b3ff52101aac44f6e67d8da18977e663ef 100644
--- a/tests/fs2000/fs2000a.mod
+++ b/tests/fs2000/fs2000a.mod
@@ -92,4 +92,4 @@ estimation(order=1,datafile=fsdat_simul,nobs=192,loglinear,mh_replic=2000,
            mode_compute=4,mh_nblocks=2,mh_drop=0.45,mh_jscale=0.65,diffuse_filter);
 
 //stoch_simul(order=1, periods=200);
-//datatomfile('fsdat_simul2', char('gy_obs', 'gp_obs', 'Y_obs', 'P_obs'));
+//datatomfile('fsdat_simul2', {'gy_obs'; 'gp_obs'; 'Y_obs'; 'P_obs'});
diff --git a/tests/kalman_filter_smoother/fs2000_smoother_only.mod b/tests/kalman_filter_smoother/fs2000_smoother_only.mod
index b24c8b94bca711bafb6b156b8e3664a735695c4a..70e4f6bc48a7c115b2f1e90c6eae71a590465635 100644
--- a/tests/kalman_filter_smoother/fs2000_smoother_only.mod
+++ b/tests/kalman_filter_smoother/fs2000_smoother_only.mod
@@ -113,4 +113,4 @@ estimation(order=1, datafile=fsdat_simul, mode_compute=0,nobs=192, loglinear, sm
  */
 
 //stoch_simul(periods=200, order=1);
-//datatomfile('fsdat_simul', char('gy_obs', 'gp_obs'));
+//datatomfile('fsdat_simul', {'gy_obs'; 'gp_obs'});
diff --git a/tests/kalman_filter_smoother/fs2000_smoother_only_ns.mod b/tests/kalman_filter_smoother/fs2000_smoother_only_ns.mod
index 557486b7999463e284e83c81cfc4a4d0fd2594dc..29fb1d9235e0ccd9bd804a32edb9b9d4f6b3240a 100644
--- a/tests/kalman_filter_smoother/fs2000_smoother_only_ns.mod
+++ b/tests/kalman_filter_smoother/fs2000_smoother_only_ns.mod
@@ -118,4 +118,4 @@ estimation(order=1, datafile=fsdat_simul, mode_compute=0,nobs=192, loglinear,dif
  */
 
 //stoch_simul(periods=200, order=1);
-//datatomfile('fsdat_simul', char('gy_obs', 'gp_obs'));
+//datatomfile('fsdat_simul', {'gy_obs'; 'gp_obs'});