diff --git a/src/@dates/private/comparison_arg_checks.m b/src/@dates/private/comparison_arg_checks.m
index a439bd1d0a45b5959f837039f0b1ce8f51452a54..b3ea15f947e3acb30ada8844800e55a79021a110 100644
--- a/src/@dates/private/comparison_arg_checks.m
+++ b/src/@dates/private/comparison_arg_checks.m
@@ -51,8 +51,8 @@ p = varargin{2};
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(1);
@@ -67,8 +67,8 @@ p = varargin{2};
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('make', 'my', 'day');
@@ -83,8 +83,8 @@ p = varargin{2};
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks('punk', dates('1950Q1'));
@@ -99,8 +99,8 @@ p = varargin{2};
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), 1);
@@ -115,8 +115,8 @@ p = varargin{2};
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'), dates('1950M1'));
@@ -131,8 +131,8 @@ p = varargin{2};
 
 %@test:6
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ try
 %$     [o, p] = comparison_arg_checks(dates('1950Q1'):dates('1950Q2'), dates('1950Q1'):dates('1950Q3'));
@@ -147,8 +147,8 @@ p = varargin{2};
 
 %@test:7
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_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 9630904aaa64926612624375e91c7d16b252eb60..672ff780fe9e418c1bff8e36283041c8814b0c37 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, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_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, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_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, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_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, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$ addpath('../../../data/')
 %$
 %$ try
diff --git a/src/@dates/private/greaterorequal.m b/src/@dates/private/greaterorequal.m
index 504414cfbdbb3018d18d955e8b12c8d22a560280..b7c1d85c855617e573d67b77c309e995ea14e731 100644
--- a/src/@dates/private/greaterorequal.m
+++ b/src/@dates/private/greaterorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/greaterthan.m b/src/@dates/private/greaterthan.m
index 38b4a3214db98e3ffa981391c151db5150d8f6b6..cbcf9c36305741bb1282e182af7ac2b2f04f6be0 100644
--- a/src/@dates/private/greaterthan.m
+++ b/src/@dates/private/greaterthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessorequal.m b/src/@dates/private/lessorequal.m
index ee7149229f7087de08377fb19270bb162db93a8c..7fcfcde3a7151ce18d773ef9d39c910e806d44a6 100644
--- a/src/@dates/private/lessorequal.m
+++ b/src/@dates/private/lessorequal.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
diff --git a/src/@dates/private/lessthan.m b/src/@dates/private/lessthan.m
index 570f1ac6e9aa392ed3b371d29c669278a6e65310..578c2f3fd0712b62dbb05a23912481a7cc15b516 100644
--- a/src/@dates/private/lessthan.m
+++ b/src/@dates/private/lessthan.m
@@ -31,8 +31,8 @@ end
 
 %@test:1
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [2, 4];
 %$ b = [1, 2];
@@ -54,8 +54,8 @@ end
 
 %@test:2
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [2, 2];
@@ -77,8 +77,8 @@ end
 
 %@test:3
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 4];
 %$ b = [1, 2];
@@ -100,8 +100,8 @@ end
 
 %@test:4
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 4];
@@ -123,8 +123,8 @@ end
 
 %@test:5
 %$ OPATH = pwd();
-%$ [DATES_PATH, ~, ~] = fileparts(which('initialize_dates_toolbox'));
-%$ cd([DATES_PATH '/@dates/private']);
+%$ DSERIES_PATH = strrep(which('dseries.initialize'),'/+dseries/initialize.m','');
+%$ cd([DSERIES_PATH '/@dates/private']);
 %$
 %$ a = [1, 2];
 %$ b = [1, 2];
@@ -142,4 +142,4 @@ end
 %$
 %$ T = all(t);
 %$ cd(OPATH);
-%@eof:5
+%@eof:5
\ No newline at end of file
diff --git a/tests/runalltests.m b/tests/runalltests.m
index d6cd65cabde7b5dced7d0198511c070da678c06d..dcef8b9ec7081a82bca224efc31482daa7bb92ea 100644
--- a/tests/runalltests.m
+++ b/tests/runalltests.m
@@ -35,10 +35,10 @@ unit_tests_root = strrep(which('runalltests'),'runalltests.m','');
 
 % Initialize the dseries module
 try
-    initialize_dseries_toolbox();
+    dseries.initialize();
 catch
     addpath([unit_tests_root '../src']);
-    initialize_dseries_toolbox();
+    dseries.initialize();
 end
 
 warning off