diff --git a/tests/unit-tests/data.t.cpp b/tests/unit-tests/data.t.cpp
index 0cf8aae..bdf5f18 100644
--- a/tests/unit-tests/data.t.cpp
+++ b/tests/unit-tests/data.t.cpp
@@ -230,7 +230,7 @@
   BOOST_REQUIRE_EQUAL(std::string(reinterpret_cast<const char*>(d.getContent().value()),
                                   d.getContent().value_size()), "SUCCESS!");
 
-  BOOST_REQUIRE_EQUAL(d.getSignature().getType(), static_cast<uint32_t>(Signature::Sha256WithRsa));
+  BOOST_REQUIRE_EQUAL(d.getSignature().getType(), tlv::SignatureSha256WithRsa);
   ndn::Block block = d.getSignature().getInfo();
   block.parse();
   KeyLocator keyLocator;
@@ -261,7 +261,7 @@
   Block signatureInfo(tlv::SignatureInfo);
   // SignatureType
   {
-    signatureInfo.push_back(makeNonNegativeIntegerBlock(tlv::SignatureType, Signature::Sha256WithRsa));
+    signatureInfo.push_back(makeNonNegativeIntegerBlock(tlv::SignatureType, tlv::SignatureSha256WithRsa));
   }
   // KeyLocator
   {
@@ -280,7 +280,7 @@
 
   RSASS<PKCS1v15, SHA256>::Signer signer(privateKey_);
 
-  PK_MessageAccumulator *hash = signer.NewSignatureAccumulator(rng_);
+  PK_MessageAccumulator* hash = signer.NewSignatureAccumulator(rng_);
   hash->Update(d.getName().    wireEncode().wire(), d.getName().    wireEncode().size());
   hash->Update(d.getMetaInfo().wireEncode().wire(), d.getMetaInfo().wireEncode().size());
   hash->Update(d.getContent().              wire(), d.getContent().              size());