diff --git a/test/ndnSIM-pit.cc b/test/ndnSIM-pit.cc
new file mode 100644
index 0000000..f039c79
--- /dev/null
+++ b/test/ndnSIM-pit.cc
@@ -0,0 +1,137 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011,2012 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#include "ndnSIM-pit.h"
+#include "ns3/core-module.h"
+#include "ns3/ndnSIM-module.h"
+
+#include <boost/lexical_cast.hpp>
+
+NS_LOG_COMPONENT_DEFINE ("CcnxPitTest");
+
+namespace ns3
+{
+
+class Client : public CcnxApp
+{
+protected:
+  void
+  StartApplication ()
+  {
+    CcnxApp::StartApplication ();
+
+    // add default route
+    Ptr<CcnxFibEntry> fibEntry = GetNode ()->GetObject<CcnxFib> ()->Add (CcnxNameComponents ("/"), m_face, 0);
+    fibEntry->UpdateStatus (m_face, CcnxFibFaceMetric::NDN_FIB_GREEN);
+    
+    Simulator::Schedule (Seconds (0.1), &Client::SendPacket, this, std::string("/1"), 1);
+    Simulator::Schedule (Seconds (0.2), &Client::SendPacket, this, std::string("/2"), 1);
+    Simulator::Schedule (Seconds (0.3), &Client::SendPacket, this, std::string("/3"), 1);
+    Simulator::Schedule (Seconds (0.4), &Client::SendPacket, this, std::string("/1"), 2);
+  }
+
+  void
+  StopApplication ()
+  {
+    CcnxApp::StopApplication ();
+  }
+
+private:
+  void
+  SendPacket (const std::string &prefix, uint32_t nonce)
+  {
+    Ptr<Packet> pkt = Create<Packet> (0);
+    CcnxInterestHeader i;
+    i.SetName (Create<CcnxNameComponents> (prefix));
+    i.SetNonce (nonce);
+    i.SetInterestLifetime (Seconds (0.5));
+
+    pkt->AddHeader (i);
+    m_protocolHandler (pkt);
+  }
+};
+
+void
+PitTest::Test (Ptr<CcnxFib> fib)
+{
+  NS_TEST_ASSERT_MSG_EQ (fib->GetSize (), 1, "There should be only one entry");
+
+  Ptr<const CcnxFibEntry> fibEntry = fib->Begin ();
+  NS_TEST_ASSERT_MSG_EQ (fibEntry->GetPrefix (), CcnxNameComponents ("/"), "prefix should be /");
+}
+
+void
+PitTest::Check0 (Ptr<CcnxPit> pit)
+{
+  // NS_LOG_DEBUG (*GetNode ()->GetObject<CcnxPit> ());
+  NS_TEST_ASSERT_MSG_EQ (pit->GetSize (), 0, "There should 0 entries in PIT");
+}
+
+void
+PitTest::Check1 (Ptr<CcnxPit> pit)
+{
+  NS_TEST_ASSERT_MSG_EQ (pit->GetSize (), 1, "There should 1 entry in PIT");
+}
+
+void
+PitTest::Check2 (Ptr<CcnxPit> pit)
+{
+  // NS_LOG_DEBUG (*GetNode ()->GetObject<CcnxPit> ());
+  NS_TEST_ASSERT_MSG_EQ (pit->GetSize (), 2, "There should 2 entries in PIT");
+}
+
+void
+PitTest::Check3 (Ptr<CcnxPit> pit)
+{
+  // NS_LOG_DEBUG (*GetNode ()->GetObject<CcnxPit> ());
+  NS_TEST_ASSERT_MSG_EQ (pit->GetSize (), 3, "There should 3 entries in PIT");
+}
+
+
+void
+PitTest::DoRun ()
+{
+  Ptr<Node> node = CreateObject<Node> ();
+  CcnxStackHelper ccnx;
+  ccnx.Install (node);
+
+  Ptr<Client> app1 = CreateObject<Client> ();
+  node->AddApplication (app1);
+
+  Simulator::Schedule (Seconds (0.0001), &PitTest::Test, this, node->GetObject<CcnxFib> ());
+    
+  Simulator::Schedule (Seconds (0.01), &PitTest::Check0, this, node->GetObject<CcnxPit> ());
+
+  Simulator::Schedule (Seconds (0.11), &PitTest::Check1, this, node->GetObject<CcnxPit> ());
+  Simulator::Schedule (Seconds (0.21), &PitTest::Check2, this, node->GetObject<CcnxPit> ());
+  Simulator::Schedule (Seconds (0.31), &PitTest::Check3, this, node->GetObject<CcnxPit> ());
+  
+  Simulator::Schedule (Seconds (0.61), &PitTest::Check3, this, node->GetObject<CcnxPit> ());
+  Simulator::Schedule (Seconds (0.71), &PitTest::Check2, this, node->GetObject<CcnxPit> ());
+  Simulator::Schedule (Seconds (0.81), &PitTest::Check1, this, node->GetObject<CcnxPit> ());
+
+  Simulator::Schedule (Seconds (0.91), &PitTest::Check0, this, node->GetObject<CcnxPit> ());
+
+  Simulator::Stop (Seconds (1.0));
+  Simulator::Run ();
+  Simulator::Destroy ();
+}
+
+}