diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 34240fe5..97bed18e 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -2049,13 +2049,12 @@ class OEMCryptoEntitlementLicenseTest : public OEMCryptoLicenseTest {
   }
 };
 
-// This verifies that entitlement keys and entitled content keys can be loaded.
+/** This verifies that entitlement keys and entitled content keys can be loaded. */
 TEST_P(OEMCryptoEntitlementLicenseTest, LoadEntitlementKeysAPI17) {
   LoadEntitlementLicense();
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
   entitled_message_1.SetEntitledKeySession(key_session_id);
@@ -2071,7 +2070,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest, CasOnlyLoadCasKeysAPI17) {
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2092,8 +2090,10 @@ TEST_P(OEMCryptoEntitlementLicenseTest, CasOnlyLoadCasKeysAPI17) {
       /*load_even=*/false, /*load_odd=*/false, OEMCrypto_SUCCESS));
 }
 
-// This verifies that entitled content keys cannot be loaded if we have not yet
-// loaded the entitlement keys.
+/**
+ * This verifies that entitled content keys cannot be loaded if we have not yet
+ * loaded the entitlement keys.
+*/
 TEST_P(OEMCryptoEntitlementLicenseTest,
        LoadEntitlementKeysNoEntitlementKeysAPI17) {
   license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
@@ -2103,7 +2103,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2112,8 +2111,10 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
       entitled_message_1.LoadKeys(OEMCrypto_ERROR_INVALID_CONTEXT));
 }
 
-// This verifies that entitled content keys cannot be loaded if we have loaded
-// the wrong entitlement keys.
+/**
+ * This verifies that entitled content keys cannot be loaded if we have loaded
+ * the wrong entitlement keys.
+ */
 TEST_P(OEMCryptoEntitlementLicenseTest,
        CasOnlyLoadCasKeysNoEntitlementKeysAPI17) {
   license_messages_.set_license_type(OEMCrypto_EntitlementLicense);
@@ -2123,7 +2124,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2132,15 +2132,16 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
       /*load_even=*/true, /*load_odd=*/true, OEMCrypto_ERROR_INVALID_CONTEXT));
 }
 
-// This verifies that entitled content keys cannot be loaded if we have loaded
-// the wrong entitlement keys.
+/**
+ * This verifies that entitled content keys cannot be loaded if we have loaded
+ * the wrong entitlement keys.
+ */
 TEST_P(OEMCryptoEntitlementLicenseTest,
        LoadEntitlementKeysWrongEntitlementKeysAPI17) {
   LoadEntitlementLicense();
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2157,7 +2158,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2168,15 +2168,16 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
       /*load_even=*/true, /*load_odd=*/true, OEMCrypto_KEY_NOT_ENTITLED));
 }
 
-// This verifies that entitled content keys cannot be loaded if we specify an
-// entitled key session that has not been created.
+/**
+ * This verifies that entitled content keys cannot be loaded if we specify an
+ * entitled key session that has not been created.
+ */
 TEST_P(OEMCryptoEntitlementLicenseTest,
        LoadEntitlementKeysWrongEntitledKeySessionAPI17) {
   LoadEntitlementLicense();
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2191,7 +2192,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2201,15 +2201,16 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
       OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION));
 }
 
-// This verifies that entitled content keys cannot be loaded if we specify an
-// entitled key session that is actually an oemcrypto session.
+/**
+ * This verifies that entitled content keys cannot be loaded if we specify an
+ * entitled key session that is actually an oemcrypto session.
+*/
 TEST_P(OEMCryptoEntitlementLicenseTest,
        LoadEntitlementKeysOemcryptoSessionAPI17) {
   LoadEntitlementLicense();
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();
@@ -2224,7 +2225,6 @@ TEST_P(OEMCryptoEntitlementLicenseTest,
   uint32_t key_session_id = 0;
   ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_CreateEntitledKeySession(
                                    session_.session_id(), &key_session_id));
-  ASSERT_NE(key_session_id, 0u);
 
   EntitledMessage entitled_message_1(&license_messages_);
   entitled_message_1.FillKeyArray();