diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_cast_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_cast_test.cpp
index 34c39319..2a6e0197 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_cast_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_cast_test.cpp
@@ -11,7 +11,7 @@ using ::testing::Range;
 
 namespace wvoec {
 
-/// @addtogroup generic
+/// @addtogroup cast
 /// @{
 
 /** If a device can load a private key with the alternate padding schemes, it
@@ -82,10 +82,7 @@ TEST_F(OEMCryptoLoadsCertificateAlternates, ForbidPrepAndSign) {
     OEMCryptoResult result = OEMCrypto_PrepAndSignLicenseRequest(
         s.session_id(), message.data(), message.size(), &core_message_length,
         signature.data(), &signature_length);
-    // TODO: remove OEMCrypto_ERROR_INVALID_RSA_KEY once OEMCrypto v16 is not
-    // supported anymore. This error code has been deprecated since v17.
-    ASSERT_TRUE(result == OEMCrypto_ERROR_INVALID_KEY ||
-                result == OEMCrypto_ERROR_INVALID_RSA_KEY);
+    ASSERT_EQ(OEMCrypto_ERROR_INVALID_KEY, result);
     const vector<uint8_t> zero(signature.size(), 0);
     ASSERT_EQ(signature, zero);  // Signature should not have been computed.
   }