diff --git a/tst/etcd_test b/tst/etcd_test
new file mode 100755
index 0000000..62bc6ee
Binary files /dev/null and b/tst/etcd_test differ
diff --git a/v3/include/Action.hpp b/v3/include/Action.hpp
index 2f9b948..31aa09e 100644
--- a/v3/include/Action.hpp
+++ b/v3/include/Action.hpp
@@ -34,16 +34,8 @@ namespace etcdv3
   class Action
   {
     public:
-    Status status;
-    ClientContext context;
-    CompletionQueue cq_;
-    void waitForResponse();
-  };
-
-  class Actionv2
-  {
-    public:
-    Actionv2(etcdv3::ActionParameters params);
+    Action(etcdv3::ActionParameters params);
+    Action(){};
     Status status;
     ClientContext context;
     CompletionQueue cq_;
diff --git a/v3/include/AsyncCompareAndDeleteAction.hpp b/v3/include/AsyncCompareAndDeleteAction.hpp
index 3f1e259..fceddbe 100644
--- a/v3/include/AsyncCompareAndDeleteAction.hpp
+++ b/v3/include/AsyncCompareAndDeleteAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncCompareAndDeleteAction : public etcdv3::Actionv2
+  class AsyncCompareAndDeleteAction : public etcdv3::Action
   {
     public:
       AsyncCompareAndDeleteAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type);
diff --git a/v3/include/AsyncCompareAndSwapAction.hpp b/v3/include/AsyncCompareAndSwapAction.hpp
index 2c97fbd..41a308a 100644
--- a/v3/include/AsyncCompareAndSwapAction.hpp
+++ b/v3/include/AsyncCompareAndSwapAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncCompareAndSwapAction : public etcdv3::Actionv2
+  class AsyncCompareAndSwapAction : public etcdv3::Action
   {
     public:
       AsyncCompareAndSwapAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type);
diff --git a/v3/include/AsyncDeleteAction.hpp b/v3/include/AsyncDeleteAction.hpp
index fd182a1..ac33d26 100644
--- a/v3/include/AsyncDeleteAction.hpp
+++ b/v3/include/AsyncDeleteAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncDeleteAction : public etcdv3::Actionv2
+  class AsyncDeleteAction : public etcdv3::Action
   {
     public:
       AsyncDeleteAction(etcdv3::ActionParameters param);
diff --git a/v3/include/AsyncGetAction.hpp b/v3/include/AsyncGetAction.hpp
index 421d54c..5c6a30b 100644
--- a/v3/include/AsyncGetAction.hpp
+++ b/v3/include/AsyncGetAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncGetAction : public etcdv3::Actionv2
+  class AsyncGetAction : public etcdv3::Action
   {
     public:
       AsyncGetAction(etcdv3::ActionParameters param);
diff --git a/v3/include/AsyncSetAction.hpp b/v3/include/AsyncSetAction.hpp
index db36654..e191b2f 100644
--- a/v3/include/AsyncSetAction.hpp
+++ b/v3/include/AsyncSetAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncSetAction : public etcdv3::Actionv2
+  class AsyncSetAction : public etcdv3::Action
   {
     public:
       AsyncSetAction(etcdv3::ActionParameters param, bool isCreate=false);
diff --git a/v3/include/AsyncUpdateAction.hpp b/v3/include/AsyncUpdateAction.hpp
index 6d40d57..20eacbe 100644
--- a/v3/include/AsyncUpdateAction.hpp
+++ b/v3/include/AsyncUpdateAction.hpp
@@ -13,7 +13,7 @@ using etcdserverpb::KV;
 
 namespace etcdv3
 {
-  class AsyncUpdateAction : public etcdv3::Actionv2
+  class AsyncUpdateAction : public etcdv3::Action
   {
     public:
       AsyncUpdateAction(etcdv3::ActionParameters param);
diff --git a/v3/include/AsyncWatchAction.hpp b/v3/include/AsyncWatchAction.hpp
index 09456ff..fdad665 100644
--- a/v3/include/AsyncWatchAction.hpp
+++ b/v3/include/AsyncWatchAction.hpp
@@ -15,7 +15,7 @@ using etcdserverpb::WatchResponse;
 
 namespace etcdv3
 {
-  class AsyncWatchAction : public etcdv3::Actionv2
+  class AsyncWatchAction : public etcdv3::Action
   {
     public:
       AsyncWatchAction(etcdv3::ActionParameters param);
diff --git a/v3/src/Action.cpp b/v3/src/Action.cpp
index 43dbf19..265798c 100644
--- a/v3/src/Action.cpp
+++ b/v3/src/Action.cpp
@@ -1,5 +1,10 @@
 #include "v3/include/Action.hpp"
 
+etcdv3::Action::Action(etcdv3::ActionParameters params)
+{
+  parameters = params;
+}
+
 void etcdv3::Action::waitForResponse() 
 {
   void* got_tag;
@@ -8,17 +13,3 @@ void etcdv3::Action::waitForResponse()
   cq_.Next(&got_tag, &ok);
   GPR_ASSERT(got_tag == (void*)this);
 }
-
-void etcdv3::Actionv2::waitForResponse() 
-{
-  void* got_tag;
-  bool ok = false;    
-
-  cq_.Next(&got_tag, &ok);
-  GPR_ASSERT(got_tag == (void*)this);
-}
-
-etcdv3::Actionv2::Actionv2(etcdv3::ActionParameters params)
-{
-  parameters = params;
-}
diff --git a/v3/src/AsyncCompareAndDeleteAction.cpp b/v3/src/AsyncCompareAndDeleteAction.cpp
index 5e509f4..cf7ff8a 100644
--- a/v3/src/AsyncCompareAndDeleteAction.cpp
+++ b/v3/src/AsyncCompareAndDeleteAction.cpp
@@ -10,7 +10,7 @@ using etcdserverpb::ResponseOp;
 using etcdserverpb::TxnRequest;
 
 etcdv3::AsyncCompareAndDeleteAction::AsyncCompareAndDeleteAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type) 
-  :etcdv3::Actionv2(param)
+  :etcdv3::Action(param)
 {
   etcdv3::Transaction transaction(parameters.key);
   if(type == etcdv3::Atomicity_Type::PREV_VALUE)
diff --git a/v3/src/AsyncCompareAndSwapAction.cpp b/v3/src/AsyncCompareAndSwapAction.cpp
index 9a863cb..acca2ef 100644
--- a/v3/src/AsyncCompareAndSwapAction.cpp
+++ b/v3/src/AsyncCompareAndSwapAction.cpp
@@ -10,7 +10,7 @@ using etcdserverpb::ResponseOp;
 using etcdserverpb::TxnRequest;
 
 etcdv3::AsyncCompareAndSwapAction::AsyncCompareAndSwapAction(etcdv3::ActionParameters param, etcdv3::Atomicity_Type type)
-  : etcdv3::Actionv2(param)  
+  : etcdv3::Action(param)  
 {
   etcdv3::Transaction transaction(parameters.key);
   if(type == etcdv3::Atomicity_Type::PREV_VALUE)
diff --git a/v3/src/AsyncDeleteAction.cpp b/v3/src/AsyncDeleteAction.cpp
index ea63356..124edaa 100644
--- a/v3/src/AsyncDeleteAction.cpp
+++ b/v3/src/AsyncDeleteAction.cpp
@@ -5,7 +5,7 @@
 using etcdserverpb::Compare;
 
 etcdv3::AsyncDeleteAction::AsyncDeleteAction(ActionParameters param)
-  : etcdv3::Actionv2(param) 
+  : etcdv3::Action(param) 
 {
   etcdv3::Transaction transaction(parameters.key);
   transaction.init_compare(Compare::CompareResult::Compare_CompareResult_GREATER,
diff --git a/v3/src/AsyncGetAction.cpp b/v3/src/AsyncGetAction.cpp
index dc19889..2b2b207 100644
--- a/v3/src/AsyncGetAction.cpp
+++ b/v3/src/AsyncGetAction.cpp
@@ -4,7 +4,7 @@
 using etcdserverpb::RangeRequest;
 
 etcdv3::AsyncGetAction::AsyncGetAction(etcdv3::ActionParameters param)
-  : etcdv3::Actionv2(param)
+  : etcdv3::Action(param)
 {
   RangeRequest get_request;
   get_request.set_key(parameters.key);
diff --git a/v3/src/AsyncSetAction.cpp b/v3/src/AsyncSetAction.cpp
index c693468..6e4f027 100644
--- a/v3/src/AsyncSetAction.cpp
+++ b/v3/src/AsyncSetAction.cpp
@@ -11,7 +11,7 @@ using etcdserverpb::ResponseOp;
 using etcdserverpb::TxnRequest;
 
 etcdv3::AsyncSetAction::AsyncSetAction(etcdv3::ActionParameters param, bool create)
-  : etcdv3::Actionv2(param) 
+  : etcdv3::Action(param) 
 {
   etcdv3::Transaction transaction(parameters.key);
   isCreate = create;
diff --git a/v3/src/AsyncUpdateAction.cpp b/v3/src/AsyncUpdateAction.cpp
index e31f58d..cd96206 100644
--- a/v3/src/AsyncUpdateAction.cpp
+++ b/v3/src/AsyncUpdateAction.cpp
@@ -11,7 +11,7 @@ using etcdserverpb::ResponseOp;
 using etcdserverpb::TxnRequest;
 
 etcdv3::AsyncUpdateAction::AsyncUpdateAction(etcdv3::ActionParameters param)
-  : etcdv3::Actionv2(param) 
+  : etcdv3::Action(param) 
 {
   etcdv3::Transaction transaction(parameters.key);
   transaction.init_compare(Compare::CompareResult::Compare_CompareResult_GREATER,
diff --git a/v3/src/AsyncWatchAction.cpp b/v3/src/AsyncWatchAction.cpp
index 8b2e3ee..0263269 100644
--- a/v3/src/AsyncWatchAction.cpp
+++ b/v3/src/AsyncWatchAction.cpp
@@ -7,7 +7,7 @@ using etcdserverpb::RangeResponse;
 using etcdserverpb::WatchCreateRequest;
 
 etcdv3::AsyncWatchAction::AsyncWatchAction(etcdv3::ActionParameters param)
-  : etcdv3::Actionv2(param) 
+  : etcdv3::Action(param) 
 {
   stream = parameters.watch_stub->AsyncWatch(&context,&cq_,(void*)"create");