diff --git a/tests/test-get-async.cpp b/tests/test-get-async.cpp
index 692ed36..60b02b5 100644
--- a/tests/test-get-async.cpp
+++ b/tests/test-get-async.cpp
@@ -14,51 +14,42 @@
 using namespace ndn;
 using namespace ptr_lib;
 
-class MyClosure : public Closure {
-public:
-  MyClosure()
-  : gotCallbackCount_(0)
-  {  
-  }
-  
-  virtual UpcallResult upcall(UpcallKind kind, const UpcallInfo &upcallInfo)
-  {
-    if (kind == UPCALL_DATA || kind == UPCALL_DATA_UNVERIFIED) {
-      ++gotCallbackCount_;
-      cout << "Got data packet with name " << upcallInfo.getData()->getName().to_uri() << endl;
-      for (unsigned int i = 0; i < upcallInfo.getData()->getContent().size(); ++i)
-        cout << upcallInfo.getData()->getContent()[i];
-      cout << endl;
-      
-      return CLOSURE_RESULT_OK;
-    }
-    else if (kind == UPCALL_INTEREST_TIMED_OUT) {
-      ++gotCallbackCount_;
-      cout << "Time out for interest  " << upcallInfo.getInterest()->getName().toUri() << endl;    
-      return CLOSURE_RESULT_OK;
-    }
-    else
-      return CLOSURE_RESULT_OK;
-  }
-  
-  int gotCallbackCount_;
-};
+static int CallbackCount = 0;
+
+void myOnData(const ptr_lib::shared_ptr<const Interest> &interest, const ptr_lib::shared_ptr<Data> &data)
+{
+  ++CallbackCount;
+  cout << "Got data packet with name " << data->getName().to_uri() << endl;
+  for (unsigned int i = 0; i < data->getContent().size(); ++i)
+    cout << data->getContent()[i];
+  cout << endl;  
+}
+
+void myOnTimeout(const ptr_lib::shared_ptr<const Interest> &interest)
+{
+  ++CallbackCount;
+  cout << "Time out for interest " << interest->getName().toUri() << endl;    
+}
 
 int main(int argc, char** argv)
 {
   try {
-    MyClosure closure;
     Face face("E.hub.ndn.ucla.edu");
     
     Name name1("/ndn/ucla.edu/apps/ndn-js-test/hello.txt/level2/%FD%05%0B%16%7D%95%0E");    
     cout << "Express name  " << name1.toUri() << endl;
-    face.expressInterest(name1, &closure);
+    face.expressInterest(name1, myOnData, myOnTimeout);
+    
     Name name2("/ndn/ucla.edu/apps/lwndn-test/howdy.txt/%FD%05%05%E8%0C%CE%1D");
     cout << "Express name  " << name2.toUri() << endl;
-    face.expressInterest(name2, &closure);
+    face.expressInterest(name2, myOnData, myOnTimeout);
+    
+    Name name3("/test/timeout");
+    cout << "Express name  " << name3.toUri() << endl;
+    face.expressInterest(name3, myOnData, myOnTimeout);
 
     // The main event loop.
-    while (closure.gotCallbackCount_ < 2) {
+    while (CallbackCount < 3) {
       face.processEvents();
       // We need to sleep for a few milliseconds so we don't use 100% of the CPU.
       usleep(10000);