diff --git a/t/Macro/AdminText.t b/t/Macro/AdminText.t
index 021544bdc..eb7406027 100644
--- a/t/Macro/AdminText.t
+++ b/t/Macro/AdminText.t
@@ -13,7 +13,6 @@ use strict;
 use lib "$FindBin::Bin/../lib";
 
 use WebGUI::Test;
-use WebGUI::Macro::AdminText;
 use WebGUI::Session;
 use Data::Dumper;
 
@@ -21,12 +20,20 @@ my $session = WebGUI::Test->session;
 
 use Test::More; # increment this value for each test you create
 
-my $numTests = 4;
+my $numTests = 6 + 1;
 
 plan tests => $numTests;
 
+my $macro = 'WebGUI::Macro::AdminText';
+my $loaded = use_ok($macro);
+
+SKIP: {
+
+skip "Unable to load $macro", $numTests-1 unless $loaded;
+
 my $output;
 
+$session->user({userId => 1});
 $output = WebGUI::Macro::AdminText::process($session, 'admin');
 is($output, '', 'user is not admin');
 
@@ -38,6 +45,14 @@ $session->var->switchAdminOn;
 $output = WebGUI::Macro::AdminText::process($session, 'admin');
 is($output, 'admin', 'admin in admin mode');
 
+$output = WebGUI::Macro::AdminText::process($session, '');
+is($output, '', 'null text');
+
+$output = WebGUI::Macro::AdminText::process($session);
+is($output, undef, 'undef text');
+
 $session->var->switchAdminOff;
 $output = WebGUI::Macro::AdminText::process($session, 'admin');
 is($output, '', 'user is admin, not in admin mode');
+
+}