diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
index 99897aea..fbb7a83c 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.cpp
@@ -377,21 +377,13 @@ TEST_F(OEMCryptoProv40Test, GetDeviceSignedCsrPayloadAPI18) {
   if (wvoec::global_features.api_version < 18) {
     GTEST_SKIP() << "Test for versions 18 and up only.";
   }
-  std::vector<uint8_t> challenge(64, 0xaa);
-  // TODO: add cppbor support for oemcrypto tests for all targets. Before that,
-  // use hex values which are equivalent of the commented cppbor statement.
-  // std::vector<uint8_t> device_info = cppbor::Map()
-  //                                       .add("manufacturer", "google")
-  //                                       .add("fused", 0)
-  //                                       .add("other", "ignored")
-  //                                       .canonicalize()
-  //                                       .encode();
-  //
-  std::vector<uint8_t> device_info = {
-      0xa3, 0x65, 0x66, 0x75, 0x73, 0x65, 0x64, 0x0,  0x65, 0x6f, 0x74,
-      0x68, 0x65, 0x72, 0x67, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x64,
-      0x6c, 0x6d, 0x61, 0x6e, 0x75, 0x66, 0x61, 0x63, 0x74, 0x75, 0x72,
-      0x65, 0x72, 0x66, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65};
+  const std::vector<uint8_t> challenge(64, 0xaa);
+  const std::vector<uint8_t> device_info = cppbor::Map()
+                                               .add("manufacturer", "google")
+                                               .add("fused", 0)
+                                               .add("other", "ignored")
+                                               .canonicalize()
+                                               .encode();
   std::vector<uint8_t> signed_csr_payload;
   size_t signed_csr_payload_length = 0;
   OEMCryptoResult sts = OEMCrypto_GetDeviceSignedCsrPayload(
@@ -416,12 +408,13 @@ TEST_F(OEMCryptoProv40Test, GetDeviceSignedCsrPayloadAPI18) {
 TEST_F(OEMCryptoProv40Test, GetDeviceSignedCsrPayloadInvalid) {
   std::vector<uint8_t> signed_csr_payload;
   size_t signed_csr_payload_length = 0;
-  std::vector<uint8_t> challenge(64, 0xaa);
-  std::vector<uint8_t> device_info = {
-      0xa3, 0x65, 0x66, 0x75, 0x73, 0x65, 0x64, 0x0,  0x65, 0x6f, 0x74,
-      0x68, 0x65, 0x72, 0x67, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x64,
-      0x6c, 0x6d, 0x61, 0x6e, 0x75, 0x66, 0x61, 0x63, 0x74, 0x75, 0x72,
-      0x65, 0x72, 0x66, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65};
+  const std::vector<uint8_t> challenge(64, 0xaa);
+  const std::vector<uint8_t> device_info = cppbor::Map()
+                                               .add("manufacturer", "google")
+                                               .add("fused", 0)
+                                               .add("other", "ignored")
+                                               .canonicalize()
+                                               .encode();
   std::vector<uint8_t> challenge_empty;
   OEMCryptoResult sts = OEMCrypto_GetDeviceSignedCsrPayload(
       challenge_empty.data(), challenge_empty.size(), device_info.data(),
@@ -431,7 +424,7 @@ TEST_F(OEMCryptoProv40Test, GetDeviceSignedCsrPayloadInvalid) {
   ASSERT_EQ(sts, OEMCrypto_ERROR_INVALID_CONTEXT);
 
   // Oversized challenge
-  std::vector<uint8_t> challenge_long(65, 0xaa);
+  const std::vector<uint8_t> challenge_long(65, 0xaa);
   sts = OEMCrypto_GetDeviceSignedCsrPayload(
       challenge_long.data(), challenge_long.size(), device_info.data(),
       device_info.size(), signed_csr_payload.data(),