diff --git a/test/testapp.cc b/test/testapp.cc
new file mode 100644
index 0000000..900f6d9
--- /dev/null
+++ b/test/testapp.cc
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 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: Zhenkai Zhu <zhenkai@cs.ucla.edu>
+ *         卞超轶 Chaoyi Bian <bcy@pku.edu.cn>
+ *	   Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#include "../model/sync-digest.h"
+#include <iostream>
+
+using namespace Sync;
+using namespace std;
+
+int
+main (int argc, char **argv)
+{
+  Digest test;
+  test << "1";
+
+  try
+    {
+      cout << "Trying to print without explicit getHash() call: ";
+      cout << test;
+      cout << "Failed (should be asserted)\n";
+    }
+  catch (...)
+    {
+      cout << "OK (exception)\n";
+    }
+  
+  // without explicit finalizing, Digest will not be complete and printing out will cause assert
+  test.getHash ();
+
+  try
+    {
+      cout << "Hash for '1' is " << test << std::endl;
+    }
+  catch (...)
+    {
+      cout << "Hash calculation failed\n";
+    }
+
+  try
+    {
+      cout << "Trying to add data to hash after finalizing: ";
+      test << "2"; // should cause an assert
+      cout << "Failed (should be asserted)\n";
+    }
+  catch (...)
+    {
+      cout << "OK (exception)\n";
+    }
+  return 0; 
+}
diff --git a/wscript b/wscript
index 700e955..c62e6f2 100644
--- a/wscript
+++ b/wscript
@@ -17,10 +17,15 @@
         conf.check_boost(lib='signals filesystem iostreams regex', libpath="/usr/lib64")
 
 def build (bld):
-    module = bld.new_task_gen(target="sync", features=['cxx', 'cxxshlib'])
-    module.source = bld.path.ant_glob(['model/*.cc',
-                                       'helper/*.cc'])
-    module.uselib = 'BOOST BOOST_IOSTREAMS SSL'
+    synclib = bld.new_task_gen (target="sync", features=['cxx', 'cxxshlib'])
+    synclib.source = bld.path.ant_glob(['model/sync-*.cc',
+                                        'helper/sync-*.cc'])
+    synclib.uselib = 'BOOST BOOST_IOSTREAMS SSL'
+
+    testapp = bld.new_task_gen (target="testapp", features=['cxx', 'cxxprogram'])
+    testapp.source = "test/testapp.cc"
+    # testapp.uselib = 'BOOST BOOST_IOSTREAMS SSL'
+    testapp.uselib_local = 'sync'
 
 # def build_ns3 (bld):
 #     deps = ['core', 'network', 'NDNabstraction']