diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 691afb3720..5d3dba0b1d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -41,12 +41,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         protected readonly ILLClientStackNetworkHandler m_networkHandler;
         protected IScene m_scene;
-
-        //private readonly ClientManager m_clientManager = new ClientManager();
-        //public ClientManager ClientManager
-        //{
-        //    get { return m_clientManager; }
-        //}
         
         /// <summary>
         /// Tweakable user settings
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 5d8c79d1b2..c821ca2764 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -25,7 +25,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using NUnit.Framework;
+using OpenSim.Region.ClientStack;
+using OpenSim.Region.ClientStack.LindenUDP;
 
 namespace OpenSim.Region.ClientStack.LindenUDP.Tests
 {
@@ -36,9 +39,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
     public class BasicCircuitTests
     {
         [Test]
-        public void TestHello()
+        public void TestAddClient()
         {
-            // Nowt here yet
+            IClientNetworkServer llUdpServer = new LLUDPServer();
+            
+            uint port = 666;            
+            llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
         }
     }
 }
diff --git a/prebuild.xml b/prebuild.xml
index 32a5ae1797..8af2909d33 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -956,6 +956,8 @@
       </Configuration>
 
       <ReferencePath>../../../../../bin/</ReferencePath>
+      <Reference name="OpenSim.Region.ClientStack"/>
+      <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
       <Reference name="nunit.framework.dll" />
 
       <Files>