diff --git a/t/Macro/AOIHits.t b/t/Macro/AOIHits.t
new file mode 100644
index 000000000..1994a4cc4
--- /dev/null
+++ b/t/Macro/AOIHits.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::AOIHits';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+
diff --git a/t/Macro/AOIRank.t b/t/Macro/AOIRank.t
new file mode 100644
index 000000000..1de4a3acc
--- /dev/null
+++ b/t/Macro/AOIRank.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::AOIRank';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+
diff --git a/t/Macro/AdSpace.t b/t/Macro/AdSpace.t
new file mode 100644
index 000000000..1a20db889
--- /dev/null
+++ b/t/Macro/AdSpace.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::AdSpace';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+
diff --git a/t/Macro/AdminBar.t b/t/Macro/AdminBar.t
new file mode 100644
index 000000000..1f8bb7484
--- /dev/null
+++ b/t/Macro/AdminBar.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::AdminBar';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+
diff --git a/t/Macro/AssetProxy.t b/t/Macro/AssetProxy.t
new file mode 100644
index 000000000..5f6c6bac6
--- /dev/null
+++ b/t/Macro/AssetProxy.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::AssetProxy';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+
diff --git a/t/Macro/Product.t b/t/Macro/Product.t
new file mode 100644
index 000000000..ec2e9be6b
--- /dev/null
+++ b/t/Macro/Product.t
@@ -0,0 +1,37 @@
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2006 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#-------------------------------------------------------------------
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+
+use WebGUI::Test;
+use WebGUI::Session;
+use HTML::TokeParser;
+
+use Test::More; # increment this value for each test you create
+
+my $session = WebGUI::Test->session;
+
+my $numTests = 0;
+
+$numTests += 1; #For the use_ok
+
+plan tests => $numTests;
+
+my $macro = 'WebGUI::Macro::Product';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
+}
+