diff --git a/Anvil/Tools/Remote.pm b/Anvil/Tools/Remote.pm
index c23d372c..ad0d3018 100755
--- a/Anvil/Tools/Remote.pm
+++ b/Anvil/Tools/Remote.pm
@@ -293,6 +293,8 @@ sub call
 		ssh_fh      => $ssh_fh,
 		start_time  => $start_time, 
 		remote_user => $remote_user,
+		port        => $port, 
+		target      => $target,
 	}});
 	
 	if (not $shell_call)
@@ -409,8 +411,7 @@ sub call
 		### TODO: Make the timeout user-configurable to handle slow connections. Make it 
 		###       'sys::timeout::{all|host} = x'
 		my $start_time = [gettimeofday];
-		$ssh_fh = Net::SSH2->new();
-		$ssh_fh->timeout(1000);
+		$ssh_fh = Net::SSH2->new(timeout => 1000);
 		if (not $ssh_fh->connect($target, $port))
 		{
 			
diff --git a/test.pl b/test.pl
deleted file mode 100755
index 1b2d2281..00000000
--- a/test.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/perl
-#
-use strict;
-use warnings;
-use Anvil::Tools;
-
-my $anvil = Anvil::Tools->new();
-$anvil->Log->level({set => 2});
-
-# This is used to initialize the database
-my $connections = $anvil->Database->connect();
-print "Connections: [$connections]\n";
-
-
-exit(0);