diff --git a/matlab/method_of_moments/method_of_moments.m b/matlab/method_of_moments/method_of_moments.m
index 9a4f57fb1..8d004042e 100644
--- a/matlab/method_of_moments/method_of_moments.m
+++ b/matlab/method_of_moments/method_of_moments.m
@@ -63,7 +63,7 @@ function [oo_, options_mom_, M_] = method_of_moments(bayestopt_, options_, oo_,
% o set_all_parameters.m
% o test_for_deep_parameters_calibration.m
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/matlab/method_of_moments/method_of_moments_check_plot.m b/matlab/method_of_moments/method_of_moments_check_plot.m
index 24b3ebb61..ceb1a15b7 100644
--- a/matlab/method_of_moments/method_of_moments_check_plot.m
+++ b/matlab/method_of_moments/method_of_moments_check_plot.m
@@ -2,7 +2,7 @@ function method_of_moments_check_plot(fun,xparam,SE_vec,options_,M_,estim_params
% Checks the estimated local minimum of the moment's distance objective
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/matlab/method_of_moments/method_of_moments_data_moments.m b/matlab/method_of_moments/method_of_moments_data_moments.m
index 15e756955..26bf7a4dc 100644
--- a/matlab/method_of_moments/method_of_moments_data_moments.m
+++ b/matlab/method_of_moments/method_of_moments_data_moments.m
@@ -16,7 +16,7 @@ function [dataMoments, m_data] = method_of_moments_data_moments(data, oo_, match
% o method_of_moments.m
% o method_of_moments_objective_function.m
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/matlab/method_of_moments/method_of_moments_objective_function.m b/matlab/method_of_moments/method_of_moments_objective_function.m
index b97c7725f..76eacd162 100644
--- a/matlab/method_of_moments/method_of_moments_objective_function.m
+++ b/matlab/method_of_moments/method_of_moments_objective_function.m
@@ -31,7 +31,7 @@ function [fval, info, exit_flag, junk1, junk2, oo_, M_, options_mom_] = method_o
% o resol
% o set_all_parameters
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/matlab/method_of_moments/method_of_moments_optimal_weighting_matrix.m b/matlab/method_of_moments/method_of_moments_optimal_weighting_matrix.m
index 7dde93568..ad2db20f7 100644
--- a/matlab/method_of_moments/method_of_moments_optimal_weighting_matrix.m
+++ b/matlab/method_of_moments/method_of_moments_optimal_weighting_matrix.m
@@ -19,7 +19,7 @@ function W_opt = method_of_moments_optimal_weighting_matrix(m_data, moments, q_l
% This function calls:
% o CorrMatrix (embedded)
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/matlab/method_of_moments/method_of_moments_standard_errors.m b/matlab/method_of_moments/method_of_moments_standard_errors.m
index 7bfd321b5..459f583f7 100644
--- a/matlab/method_of_moments/method_of_moments_standard_errors.m
+++ b/matlab/method_of_moments/method_of_moments_standard_errors.m
@@ -29,7 +29,7 @@ function [SE_values, Asympt_Var] = method_of_moments_standard_errors(xparam, obj
% o SMM_objective_function.m
% o method_of_moments_optimal_weighting_matrix
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/tests/estimation/method_of_moments/AnScho/AnScho_MoM.mod b/tests/estimation/method_of_moments/AnScho/AnScho_MoM.mod
index 83cec9136..45fe859e5 100644
--- a/tests/estimation/method_of_moments/AnScho/AnScho_MoM.mod
+++ b/tests/estimation/method_of_moments/AnScho/AnScho_MoM.mod
@@ -2,7 +2,7 @@
% An, Sungbae and Schorfheide, Frank, (2007), Bayesian Analysis of DSGE Models, Econometric Reviews, 26, issue 2-4, p. 113-172.
% Adapted by Willi Mutschler (@wmutschl, willi@mutschler.eu)
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_Andreasen.mod b/tests/estimation/method_of_moments/RBC/RBC_MoM_Andreasen.mod
index ae6984005..ba5e62648 100644
--- a/tests/estimation/method_of_moments/RBC/RBC_MoM_Andreasen.mod
+++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_Andreasen.mod
@@ -1,6 +1,6 @@
% Tests SMM and GMM routines
%
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_SMM_ME.mod b/tests/estimation/method_of_moments/RBC/RBC_MoM_SMM_ME.mod
index 964862670..fe7aaffc9 100644
--- a/tests/estimation/method_of_moments/RBC/RBC_MoM_SMM_ME.mod
+++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_SMM_ME.mod
@@ -1,3 +1,5 @@
+% =========================================================================
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_common.inc b/tests/estimation/method_of_moments/RBC/RBC_MoM_common.inc
index d480e35c0..330dd2fcf 100644
--- a/tests/estimation/method_of_moments/RBC/RBC_MoM_common.inc
+++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_common.inc
@@ -2,7 +2,23 @@
% Andreasen, Fernández-Villaverde, Rubio-RamÃrez (2018): "The Pruned State-Space System for Non-Linear DSGE Models: Theory and Empirical Applications", Review of Economic Studies, 85(1):1-49.
% Adapted by Willi Mutschler (@wmutschl, willi@mutschler.eu)
% =========================================================================
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
+%
+% This file is part of Dynare.
+%
+% Dynare 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.
+%
+% Dynare 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 Dynare. If not, see .
+% =========================================================================
var k $K$
c $C$
diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_prefilter.mod b/tests/estimation/method_of_moments/RBC/RBC_MoM_prefilter.mod
index 7fb29f8ab..71c3b4b15 100644
--- a/tests/estimation/method_of_moments/RBC/RBC_MoM_prefilter.mod
+++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_prefilter.mod
@@ -1,6 +1,6 @@
% Tests SMM and GMM routines with prefilter, explicit initialization, and estimated_params_init(use_calibration);
%
-% Copyright (C) 2020 Dynare Team
+% Copyright (C) 2020-2021 Dynare Team
%
% This file is part of Dynare.
%
diff --git a/tests/estimation/method_of_moments/RBC/RBC_MoM_steady_helper.m b/tests/estimation/method_of_moments/RBC/RBC_MoM_steady_helper.m
index b495e27a1..9c43619d7 100644
--- a/tests/estimation/method_of_moments/RBC/RBC_MoM_steady_helper.m
+++ b/tests/estimation/method_of_moments/RBC/RBC_MoM_steady_helper.m
@@ -1,3 +1,21 @@
+% =========================================================================
+% Copyright (C) 2020-2021 Dynare Team
+%
+% This file is part of Dynare.
+%
+% Dynare 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.
+%
+% Dynare 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 Dynare. If not, see .
+% =========================================================================
function [N, info]= RBC_MoM_steady_helper(THETA,ETAl,ETAc,BETTA,B,C_O_N,W)
info=0;
if ~isreal(C_O_N)