diff --git a/t/Session_DateTime.t b/t/Session/DateTime.t
similarity index 97%
rename from t/Session_DateTime.t
rename to t/Session/DateTime.t
index 9b084f776..2c6b81b78 100644
--- a/t/Session_DateTime.t
+++ b/t/Session/DateTime.t
@@ -10,7 +10,7 @@
  
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -57,7 +57,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 sub cleanup {
         my $session = shift;
diff --git a/t/Session_Env.t b/t/Session/Env.t
similarity index 93%
rename from t/Session_Env.t
rename to t/Session/Env.t
index 705ab6770..56a809b10 100644
--- a/t/Session_Env.t
+++ b/t/Session/Env.t
@@ -10,7 +10,7 @@
 
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -34,7 +34,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 
 sub cleanup {
diff --git a/t/Session_Id.t b/t/Session/Id.t
similarity index 94%
rename from t/Session_Id.t
rename to t/Session/Id.t
index 187a9c9b8..341176f73 100644
--- a/t/Session_Id.t
+++ b/t/Session/Id.t
@@ -10,7 +10,7 @@
 
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -46,7 +46,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 
 sub cleanup {
diff --git a/t/Session_Os.t b/t/Session/Os.t
similarity index 93%
rename from t/Session_Os.t
rename to t/Session/Os.t
index 7ad65247f..5ad42c4a2 100644
--- a/t/Session_Os.t
+++ b/t/Session/Os.t
@@ -10,7 +10,7 @@
 
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -35,7 +35,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 
 sub cleanup {
diff --git a/t/Session_Setting.t b/t/Session/Setting.t
similarity index 95%
rename from t/Session_Setting.t
rename to t/Session/Setting.t
index 30935cfce..5e64953f4 100644
--- a/t/Session_Setting.t
+++ b/t/Session/Setting.t
@@ -10,7 +10,7 @@
  
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -39,7 +39,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 sub cleanup {
         my $session = shift;
diff --git a/t/Session_Stow.t b/t/Session/Stow.t
similarity index 90%
rename from t/Session_Stow.t
rename to t/Session/Stow.t
index e8f7f038f..1e6a13cf2 100644
--- a/t/Session_Stow.t
+++ b/t/Session/Stow.t
@@ -10,7 +10,7 @@
  
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -19,9 +19,8 @@ use Test::More tests => 22; # increment this value for each test you create
 my $session = initialize();  # this line is required
  
 # put your tests here
-use WebGUI::Session::Stow;
  
-my $stow  = WebGUI::Session::Stow->new($session);
+my $stow  = $session->stow;
 my $count = 0;
 my $maxCount = 20;
 
@@ -48,7 +47,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 sub cleanup {
         my $session = shift;
diff --git a/t/Session_Var.t b/t/Session/Var.t
similarity index 92%
rename from t/Session_Var.t
rename to t/Session/Var.t
index 18f48c10c..c3764dfad 100644
--- a/t/Session_Var.t
+++ b/t/Session/Var.t
@@ -10,7 +10,7 @@
  
 # ---- BEGIN DO NOT EDIT ----
 use strict;
-use lib '../lib';
+use lib '../../lib';
 use Getopt::Long;
 use WebGUI::Session;
 # ---- END DO NOT EDIT ----
@@ -18,8 +18,6 @@ use Test::More tests => 6; # increment this value for each test you create
  
 my $session = initialize();  # this line is required
  
-# put your tests here
-use WebGUI::Session::Var;
  
 ok($session->var->getId ne "", "getId()");
 ok($session->var->get("lastPageView") > 0, "get()");
@@ -44,7 +42,7 @@ sub initialize {
                 'configFile=s'=>\$configFile
         );
         exit 1 unless ($configFile);
-        my $session = WebGUI::Session->open("..",$configFile);
+        my $session = WebGUI::Session->open("../..",$configFile);
 }
 sub cleanup {
         my $session = shift;