diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m
index 82fa4556236a8d57b6435d8c282729726b3ae959..7abcd82f4651a4e13066d4dd39e7c0d8cf747721 100644
--- a/src/@dates/private/comparison_arg_checks.m
+++ b/src/@dates/private/comparison_arg_checks.m
@@ -49,8 +49,8 @@ p = varargin{2};
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(1);
@@ -65,8 +65,8 @@ p = varargin{2};
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('make', 'my', 'day');
@@ -81,8 +81,8 @@ p = varargin{2};
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('punk', dates('1950Q1'));
@@ -97,8 +97,8 @@ p = varargin{2};
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), 1);
@@ -113,8 +113,8 @@ p = varargin{2};
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), dates('1950M1'));
@@ -129,8 +129,8 @@ p = varargin{2};
 
 %@test:6
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'):dates('1950Q2'), dates('1950Q1'):dates('1950Q3'));
@@ -145,8 +145,8 @@ p = varargin{2};
 
 %@test:7
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q2'), dates('1950Q1'));
diff --git a/src/@dates/private/dates4display.m b/src/@dates/private/dates4display.m
index b8d1a0a49989017a28bb66aa342d005007fc6d98..e59819692392ed77be0ab976a5f2d6d52b46c191 100644
--- a/src/@dates/private/dates4display.m
+++ b/src/@dates/private/dates4display.m
@@ -49,8 +49,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -77,8 +77,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -105,8 +105,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
@@ -133,8 +133,8 @@ str = sprintf('%s%s>\n', str, date2string(o.time(o.length(),:),o.freq));
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
diff --git a/src/@dates/private/greaterorequal.m b/src/@dates/private/greaterorequal.m
index d99a0ce42a4dd15a6886ff5e4a6fb2bffb605fa5..89796730c477f7425efe085eafea84a7bd313aed 100644
--- a/src/@dates/private/greaterorequal.m
+++ b/src/@dates/private/greaterorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/greaterthan.m b/src/@dates/private/greaterthan.m
index ffc7695d63b4a86d8e85492e1050cc79bf90416e..cbdfca6c1d6ea4d132b2a10dce52864d7840b9d6 100644
--- a/src/@dates/private/greaterthan.m
+++ b/src/@dates/private/greaterthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessorequal.m b/src/@dates/private/lessorequal.m
index 58d05e7a3598b29a3ce218858fee311a558a508b..9b33b5db595b02e60e909b20dd71d10ce8b67011 100644
--- a/src/@dates/private/lessorequal.m
+++ b/src/@dates/private/lessorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessthan.m b/src/@dates/private/lessthan.m
index c2e32281bb2e4bf6f3027abf50d6bdd1619b9bef..57563da38fadf1641e42579a46a22c763573d228 100644
--- a/src/@dates/private/lessthan.m
+++ b/src/@dates/private/lessthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, junk1, junk2] = fileparts(which('dates'));
-%$ cd([DATES_PATH '/private']);
+%$ [DATES_PATH, junk1, junk2] = fileparts(which('initialize_dates_toolbox'));
+%$ cd([DATES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];