diff --git a/lib/WebGUI/Session/Env.pm b/lib/WebGUI/Session/Env.pm
index 491767c0d..908da6ea9 100644
--- a/lib/WebGUI/Session/Env.pm
+++ b/lib/WebGUI/Session/Env.pm
@@ -50,7 +50,7 @@ returns true if the remote address matches a site which is a known indexer or sp
 sub callerIsSearchSite {
 
     my $self = shift;
-    my $remoteAddress = $self->get('REMOTE_ADDR');
+    my $remoteAddress = $self->getIp;
 
     return 1 if $remoteAddress =~ /203\.87\.123\.1../    # Blaiz Enterprise Rawgrunt search
              || $remoteAddress =~ /123\.113\.184\.2../   # Unknown Yahoo Robot
diff --git a/t/International.t b/t/International.t
index 0346c244c..2ed665dda 100644
--- a/t/International.t
+++ b/t/International.t
@@ -21,7 +21,7 @@ my $session = WebGUI::Test->session;
 
 my $numTests  = 1; ##For conditional load check
 my $langTests = 4; ##For language look-up tests
-$numTests    += 11 + $langTests;
+$numTests    += 12 + $langTests;
 
 plan tests => $numTests;
 
@@ -81,11 +81,6 @@ SKIP: {
 		'Key Contained Spaces',
 		'keys with spaces work'
 	);
-	is(
-		$i18n->get('template url_addAlbum','Asset_Gallery'),
-		'Key Contained Spaces',
-		'keys with spaces work'
-	);
 
 }