diff --git a/matlab/@dynDate/colon.m b/matlab/@dynDate/colon.m
index 9f794b1b1..d1c7138b7 100644
--- a/matlab/@dynDate/colon.m
+++ b/matlab/@dynDate/colon.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function sp = colon(a,b)
+function sp = colon(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{sp} =} colon (@var{a},@var{b})
diff --git a/matlab/@dynDate/dynDate.m b/matlab/@dynDate/dynDate.m
index 41fc90b1b..a4383d829 100644
--- a/matlab/@dynDate/dynDate.m
+++ b/matlab/@dynDate/dynDate.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function date = dynDate(a,b)
+function date = dynDate(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{date} =} dynDate (@var{a})
diff --git a/matlab/@dynDate/eq.m b/matlab/@dynDate/eq.m
index 82edfb527..86b47133e 100644
--- a/matlab/@dynDate/eq.m
+++ b/matlab/@dynDate/eq.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = eq(a,b)
+function c = eq(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} eq (@var{a},@var{b})
diff --git a/matlab/@dynDate/format.m b/matlab/@dynDate/format.m
index 5258ba0ba..686a8f82b 100644
--- a/matlab/@dynDate/format.m
+++ b/matlab/@dynDate/format.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function p = format(date)
+function p = format(date) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{p} =} format (@var{date})
diff --git a/matlab/@dynDate/ge.m b/matlab/@dynDate/ge.m
index 15cec1a6a..2ab2ece18 100644
--- a/matlab/@dynDate/ge.m
+++ b/matlab/@dynDate/ge.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = ge(a,b)
+function c = ge(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} ge (@var{a},@var{b})
diff --git a/matlab/@dynDate/gt.m b/matlab/@dynDate/gt.m
index 0f2bde4d9..1da3f3fd9 100644
--- a/matlab/@dynDate/gt.m
+++ b/matlab/@dynDate/gt.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = gt(a,b)
+function c = gt(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} gt (@var{a},@var{b})
diff --git a/matlab/@dynDate/isempty.m b/matlab/@dynDate/isempty.m
index df8c9adba..e0148ef7b 100644
--- a/matlab/@dynDate/isempty.m
+++ b/matlab/@dynDate/isempty.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function b = isempty(a)
+function b = isempty(a) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{b} =} isempty (@var{a})
diff --git a/matlab/@dynDate/le.m b/matlab/@dynDate/le.m
index 63e94d5fb..67fb532a3 100644
--- a/matlab/@dynDate/le.m
+++ b/matlab/@dynDate/le.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = le(a,b)
+function c = le(a,b)  % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} le (@var{a},@var{b})
diff --git a/matlab/@dynDate/lt.m b/matlab/@dynDate/lt.m
index e48eec784..789814ddf 100644
--- a/matlab/@dynDate/lt.m
+++ b/matlab/@dynDate/lt.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = lt(a,b)
+function c = lt(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} lt (@var{a},@var{b})
diff --git a/matlab/@dynDate/max.m b/matlab/@dynDate/max.m
index 196ff3248..cff76e1f6 100644
--- a/matlab/@dynDate/max.m
+++ b/matlab/@dynDate/max.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = max(a,b)
+function c = max(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} max (@var{a},@var{b})
diff --git a/matlab/@dynDate/min.m b/matlab/@dynDate/min.m
index 29dea5d74..9b809f304 100644
--- a/matlab/@dynDate/min.m
+++ b/matlab/@dynDate/min.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = min(a,b)
+function c = min(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} min (@var{a},@var{b})
diff --git a/matlab/@dynDate/minus.m b/matlab/@dynDate/minus.m
index bebd9f7d1..6546a2676 100644
--- a/matlab/@dynDate/minus.m
+++ b/matlab/@dynDate/minus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = minus(a,b)
+function c = minus(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} minus (@var{a},@var{b})
diff --git a/matlab/@dynDate/ne.m b/matlab/@dynDate/ne.m
index d5b5585a5..9114e201c 100644
--- a/matlab/@dynDate/ne.m
+++ b/matlab/@dynDate/ne.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = ne(a,b)
+function c = ne(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} ne (@var{a},@var{b})
diff --git a/matlab/@dynDate/plus.m b/matlab/@dynDate/plus.m
index aaea7c680..4e624c5d8 100644
--- a/matlab/@dynDate/plus.m
+++ b/matlab/@dynDate/plus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function c = plus(a,b)
+function c = plus(a,b) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{c} =} plus (@var{a},@var{b})
diff --git a/matlab/@dynDate/subsref.m b/matlab/@dynDate/subsref.m
index 76d445741..3db665597 100644
--- a/matlab/@dynDate/subsref.m
+++ b/matlab/@dynDate/subsref.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function B = subsref(A,S)
+function B = subsref(A,S) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} subsref (@var{ts},S)
diff --git a/matlab/@dynDate/uminus.m b/matlab/@dynDate/uminus.m
index 02b9bb7db..8dc0fdc7c 100644
--- a/matlab/@dynDate/uminus.m
+++ b/matlab/@dynDate/uminus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function b = uminus(a)
+function b = uminus(a) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{b} =} uminus (@var{a})
diff --git a/matlab/@dynDate/uplus.m b/matlab/@dynDate/uplus.m
index c056d265b..c742d49ea 100644
--- a/matlab/@dynDate/uplus.m
+++ b/matlab/@dynDate/uplus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function b = uplus(a)
+function b = uplus(a) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{b} =} uplus (@var{a})
diff --git a/matlab/@dynDates/append.m b/matlab/@dynDates/append.m
index df0d52fa6..b0432928e 100644
--- a/matlab/@dynDates/append.m
+++ b/matlab/@dynDates/append.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function dd = append(dd,a)
+function dd = append(dd,a) % --*-- Unitary tests --*--
+
 % append method for dynDates class.
 
 %@info:
diff --git a/matlab/@dynDates/dynDates.m b/matlab/@dynDates/dynDates.m
index ceb5b521c..12ecd7c80 100644
--- a/matlab/@dynDates/dynDates.m
+++ b/matlab/@dynDates/dynDates.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function dd = dynDates(varargin)
+function dd = dynDates(varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{dd} =} dynDates (@var{a},@var{b},...)
diff --git a/matlab/@dynDates/eq.m b/matlab/@dynDates/eq.m
index 567c087f0..e0d4f4d7c 100644
--- a/matlab/@dynDates/eq.m
+++ b/matlab/@dynDates/eq.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = eq(A,B)
+function C = eq(A,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} eq (@var{A},@var{B})
diff --git a/matlab/@dynDates/intersect.m b/matlab/@dynDates/intersect.m
index 8e70ebab6..e5c2a1b8a 100644
--- a/matlab/@dynDates/intersect.m
+++ b/matlab/@dynDates/intersect.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = intersect(A,B)
+function C = intersect(A,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} intersect (@var{A},@var{B})
diff --git a/matlab/@dynDates/isempty.m b/matlab/@dynDates/isempty.m
index e8be87b26..935d8d06c 100644
--- a/matlab/@dynDates/isempty.m
+++ b/matlab/@dynDates/isempty.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function B = isempty(A)
+function B = isempty(A) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{B} =} isempty (@var{A})
diff --git a/matlab/@dynDates/minus.m b/matlab/@dynDates/minus.m
index fd209b0c5..7e41ac648 100644
--- a/matlab/@dynDates/minus.m
+++ b/matlab/@dynDates/minus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = minus(A,B)
+function C = minus(A,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} minus (@var{A},@var{B})
diff --git a/matlab/@dynDates/plus.m b/matlab/@dynDates/plus.m
index f1a769617..25a8f6e78 100644
--- a/matlab/@dynDates/plus.m
+++ b/matlab/@dynDates/plus.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = plus(A,B)
+function C = plus(A,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} plus (@var{A},@var{B})
diff --git a/matlab/@dynDates/pop.m b/matlab/@dynDates/pop.m
index 83448580c..3f11cb8c1 100644
--- a/matlab/@dynDates/pop.m
+++ b/matlab/@dynDates/pop.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function dd = pop(dd,a)
+function dd = pop(dd,a) % --*-- Unitary tests --*--
+
 % pop method for dynDates class (removes a date)).
 
 %@info:
diff --git a/matlab/@dynDates/sort.m b/matlab/@dynDates/sort.m
index 62fba94e1..53e62c49d 100644
--- a/matlab/@dynDates/sort.m
+++ b/matlab/@dynDates/sort.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function dd = sort(dd)
+function dd = sort(dd) % --*-- Unitary tests --*--
+
 % sort method for dynDates class.
 
 %@info:
diff --git a/matlab/@dynDates/subsref.m b/matlab/@dynDates/subsref.m
index e57bdd389..fab2cce03 100644
--- a/matlab/@dynDates/subsref.m
+++ b/matlab/@dynDates/subsref.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function B = subsref(A,S)
+function B = subsref(A,S) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} subsref (@var{ts},S)
diff --git a/matlab/@dynDates/union.m b/matlab/@dynDates/union.m
index 54e596d9c..59eab7e28 100644
--- a/matlab/@dynDates/union.m
+++ b/matlab/@dynDates/union.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = union(A,varargin)
+function C = union(A,varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} union (@var{A},@var{B})
diff --git a/matlab/@dynDates/unique.m b/matlab/@dynDates/unique.m
index 5a9d31a05..340c007fe 100644
--- a/matlab/@dynDates/unique.m
+++ b/matlab/@dynDates/unique.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function dd = unique(dd)
+function dd = unique(dd) % --*-- Unitary tests --*--
+
 % unique method for dynDates class.
 
 %@info:
diff --git a/matlab/@dynSeries/align.m b/matlab/@dynSeries/align.m
index 63b983da3..4b3d45960 100644
--- a/matlab/@dynSeries/align.m
+++ b/matlab/@dynSeries/align.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function [a,b] = align(a, b)
+function [a,b] = align(a, b) % --*-- Unitary tests --*--
     
 %@info:
 %! @deftypefn {Function File} {[@var{a}, @var{b}] =} align (@var{a}, @var{b})
diff --git a/matlab/@dynSeries/dynSeries.m b/matlab/@dynSeries/dynSeries.m
index 92d357468..dfe4d8d01 100644
--- a/matlab/@dynSeries/dynSeries.m
+++ b/matlab/@dynSeries/dynSeries.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function ts = dynSeries(varargin)
+function ts = dynSeries(varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{ts} =} dynSeries (@var{a},@var{b},@var{c},@var{d})
diff --git a/matlab/@dynSeries/eq.m b/matlab/@dynSeries/eq.m
index d8d2f7ee4..2906f1c90 100644
--- a/matlab/@dynSeries/eq.m
+++ b/matlab/@dynSeries/eq.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function C = eq(A,B)
+function C = eq(A,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{C} =} eq (@var{A},@var{B})
diff --git a/matlab/@dynSeries/extract.m b/matlab/@dynSeries/extract.m
index feabd0547..d51e08da7 100644
--- a/matlab/@dynSeries/extract.m
+++ b/matlab/@dynSeries/extract.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = extract(B,varargin)
+function A = extract(B,varargin) % --*-- Unitary tests --*--
+
 % Extract some variables from a database.
     
 % Copyright (C) 2012-2013 Dynare Team
diff --git a/matlab/@dynSeries/horzcat.m b/matlab/@dynSeries/horzcat.m
index 798ad2657..dec0d0822 100644
--- a/matlab/@dynSeries/horzcat.m
+++ b/matlab/@dynSeries/horzcat.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function a = horzcat(varargin)
+function a = horzcat(varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function file} {@var{a} =} horzcat (@var{b},@var{c}, ...)
diff --git a/matlab/@dynSeries/insert.m b/matlab/@dynSeries/insert.m
index 9dba32239..95377f090 100644
--- a/matlab/@dynSeries/insert.m
+++ b/matlab/@dynSeries/insert.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function ts = insert(ts,us,id)
+function ts = insert(ts,us,id) % --*-- Unitary tests --*--
+
 % Add a variable in a dynSeries object.
 
 %@info:
diff --git a/matlab/@dynSeries/lag.m b/matlab/@dynSeries/lag.m
index c82e26e03..04ba4734f 100644
--- a/matlab/@dynSeries/lag.m
+++ b/matlab/@dynSeries/lag.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function us = lag(ts,p)
+function us = lag(ts,p) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} lag (@var{ts})
diff --git a/matlab/@dynSeries/merge.m b/matlab/@dynSeries/merge.m
index 436a67aa8..25e3183ba 100644
--- a/matlab/@dynSeries/merge.m
+++ b/matlab/@dynSeries/merge.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = merge(B,C)
+function A = merge(B,C) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} merge (@var{B},@var{C})
 %! @anchor{@dynSeries/plus}
diff --git a/matlab/@dynSeries/minus.m b/matlab/@dynSeries/minus.m
index 2cabd90b5..5f88b728a 100644
--- a/matlab/@dynSeries/minus.m
+++ b/matlab/@dynSeries/minus.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = minus(B,C)
+function A = minus(B,C) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} minus (@var{B},@var{C})
 %! @anchor{@dynSeries/minus}
diff --git a/matlab/@dynSeries/mrdivide.m b/matlab/@dynSeries/mrdivide.m
index f05dc6eea..c8f04b36c 100644
--- a/matlab/@dynSeries/mrdivide.m
+++ b/matlab/@dynSeries/mrdivide.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = mrdivide(B,C)
+function A = mrdivide(B,C) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} mrdivide (@var{B},@var{C})
 %! @anchor{@dynSeries/mrdivide}
diff --git a/matlab/@dynSeries/mtimes.m b/matlab/@dynSeries/mtimes.m
index 758342c72..d95f88184 100644
--- a/matlab/@dynSeries/mtimes.m
+++ b/matlab/@dynSeries/mtimes.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = mtimes(B,C)
+function A = mtimes(B,C) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} mtimes (@var{B},@var{C})
 %! @anchor{@dynSeries/mtimes}
diff --git a/matlab/@dynSeries/plus.m b/matlab/@dynSeries/plus.m
index 9ab3e58e7..969374b5c 100644
--- a/matlab/@dynSeries/plus.m
+++ b/matlab/@dynSeries/plus.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = plus(B,C)
+function A = plus(B,C) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} plus (@var{B},@var{C})
 %! @anchor{@dynSeries/plus}
diff --git a/matlab/@dynSeries/pop.m b/matlab/@dynSeries/pop.m
index c242af042..371374eff 100644
--- a/matlab/@dynSeries/pop.m
+++ b/matlab/@dynSeries/pop.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function [ts,id] = pop(ts,a)
+function [ts,id] = pop(ts,a) % --*-- Unitary tests --*--
+
 % Removes a variable from a dynSeries object.
 
 %@info:
diff --git a/matlab/@dynSeries/qdiff.m b/matlab/@dynSeries/qdiff.m
index 528cbd95b..e287bfa02 100644
--- a/matlab/@dynSeries/qdiff.m
+++ b/matlab/@dynSeries/qdiff.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function us = qdiff(ts)
+function us = qdiff(ts) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} qdiff (@var{ts})
diff --git a/matlab/@dynSeries/qgrowth.m b/matlab/@dynSeries/qgrowth.m
index 6ed395efc..562cd90d9 100644
--- a/matlab/@dynSeries/qgrowth.m
+++ b/matlab/@dynSeries/qgrowth.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function us = qgrowth(ts)
+function us = qgrowth(ts) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} qgrowth (@var{ts})
diff --git a/matlab/@dynSeries/rename.m b/matlab/@dynSeries/rename.m
index 005cc1985..9ba5186af 100644
--- a/matlab/@dynSeries/rename.m
+++ b/matlab/@dynSeries/rename.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function ts = rename(ts,old,new)
+function ts = rename(ts,old,new) % --*-- Unitary tests --*--
 
 % Copyright (C) 2013 Dynare Team
 %
diff --git a/matlab/@dynSeries/save.m b/matlab/@dynSeries/save.m
index ff3269a96..a098b8258 100644
--- a/matlab/@dynSeries/save.m
+++ b/matlab/@dynSeries/save.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function save(A,basename,format)
+function save(A,basename,format) % --*-- Unitary tests --*--
+
 % Saves a dynSeries object on disk.
 
 % Copyright (C) 2013 Dynare Team
diff --git a/matlab/@dynSeries/set_names.m b/matlab/@dynSeries/set_names.m
index b316c090e..3d0aff1c8 100644
--- a/matlab/@dynSeries/set_names.m
+++ b/matlab/@dynSeries/set_names.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function A = set_names(B,varargin)
+function A = set_names(B,varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{A} =} times (@var{B},@code{varargin})
diff --git a/matlab/@dynSeries/subsasgn.m b/matlab/@dynSeries/subsasgn.m
index fbc4d09c9..da176ea21 100644
--- a/matlab/@dynSeries/subsasgn.m
+++ b/matlab/@dynSeries/subsasgn.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function A = subsasgn(A,S,B)
+function A = subsasgn(A,S,B) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{A} =} subsasgn (@var{A}, @var{S}, @var{B})
diff --git a/matlab/@dynSeries/subsref.m b/matlab/@dynSeries/subsref.m
index 7ac3e5caf..88298e528 100644
--- a/matlab/@dynSeries/subsref.m
+++ b/matlab/@dynSeries/subsref.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function B = subsref(A, S)
+function B = subsref(A, S) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{us} =} subsref (@var{ts},S)
 %! @anchor{@dynSeries/subsref}
diff --git a/matlab/@dynSeries/tex_rename.m b/matlab/@dynSeries/tex_rename.m
index 7b3da171f..5cfa27fc4 100644
--- a/matlab/@dynSeries/tex_rename.m
+++ b/matlab/@dynSeries/tex_rename.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function ts = tex_rename(ts, varargin)
+function ts = tex_rename(ts, varargin) % --*-- Unitary tests --*--
 
 % Copyright (C) 2013 Dynare Team
 %
diff --git a/matlab/@dynSeries/uminus.m b/matlab/@dynSeries/uminus.m
index 3a4b0a8b0..b93aacbee 100644
--- a/matlab/@dynSeries/uminus.m
+++ b/matlab/@dynSeries/uminus.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function A = uminus(B)
+function A = uminus(B) % --*-- Unitary tests --*--
+
 %@info:
 %! @deftypefn {Function File} {@var{A} =} plus (@var{B},@var{C})
 %! @anchor{@dynSeries/uminus}
diff --git a/matlab/@dynSeries/vertcat.m b/matlab/@dynSeries/vertcat.m
index a2a909479..cd99cf84a 100644
--- a/matlab/@dynSeries/vertcat.m
+++ b/matlab/@dynSeries/vertcat.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function a = vertcat(varargin)
+function a = vertcat(varargin) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function file} {@var{a} =} vertcat (@var{b},@var{c}, ...)
diff --git a/matlab/@dynSeries/ydiff.m b/matlab/@dynSeries/ydiff.m
index d4ac43d04..87d7c2619 100644
--- a/matlab/@dynSeries/ydiff.m
+++ b/matlab/@dynSeries/ydiff.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function us = ydiff(ts)
+function us = ydiff(ts) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} ydiff (@var{ts})
diff --git a/matlab/@dynSeries/ygrowth.m b/matlab/@dynSeries/ygrowth.m
index 78df1d1cc..065e2f6f6 100644
--- a/matlab/@dynSeries/ygrowth.m
+++ b/matlab/@dynSeries/ygrowth.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function us = ygrowth(ts)
+function us = ygrowth(ts) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {@var{us} =} ygrowth (@var{ts})
diff --git a/matlab/cycle_reduction.m b/matlab/cycle_reduction.m
index 1449e2a52..90a24d34e 100644
--- a/matlab/cycle_reduction.m
+++ b/matlab/cycle_reduction.m
@@ -1,5 +1,4 @@
-% --*-- Unitary tests --*--
-function [X, info] = cycle_reduction(A0, A1, A2, cvg_tol, ch)
+function [X, info] = cycle_reduction(A0, A1, A2, cvg_tol, ch) % --*-- Unitary tests --*--
 
 %@info:
 %! @deftypefn {Function File} {[@var{X}, @var{info}] =} cycle_reduction (@var{A0},@var{A1},@var{A2},@var{cvg_tol},@var{ch})
diff --git a/matlab/utilities/general/name2tex.m b/matlab/utilities/general/name2tex.m
index b95807e4d..213ad7bbb 100644
--- a/matlab/utilities/general/name2tex.m
+++ b/matlab/utilities/general/name2tex.m
@@ -1,5 +1,5 @@
-% --*-- Unitary tests --*--
-function tex = name2tex(name, info)
+function tex = name2tex(name, info) % --*-- Unitary tests --*--
+
 % Converts plain text name into tex name.
  
 % Copyright (C) 2013 Dynare Team
diff --git a/matlab/utilities/tests/is_unitary_test_available.m b/matlab/utilities/tests/is_unitary_test_available.m
index e4e34e08d..80a3bc240 100644
--- a/matlab/utilities/tests/is_unitary_test_available.m
+++ b/matlab/utilities/tests/is_unitary_test_available.m
@@ -44,9 +44,8 @@ info = 0;
 
 fid = fopen(fun,'r');
 first_line = fgetl(fid);
+fclose(fid);
 
-if strcmp(first_line,'% --*-- Unitary tests --*--')
+if strfind(first_line,'% --*-- Unitary tests --*--')
     info = 1;
-end
-
-fclose(fid);
\ No newline at end of file
+end
\ No newline at end of file