diff --git a/libwvdrmengine/cdm/test/request_license_test.cpp b/libwvdrmengine/cdm/test/request_license_test.cpp
index 3813ff60..f7b38594 100644
--- a/libwvdrmengine/cdm/test/request_license_test.cpp
+++ b/libwvdrmengine/cdm/test/request_license_test.cpp
@@ -2501,7 +2501,9 @@ TEST_P(WvCdmUsageTest, WithClientId) {
   CdmUsageInfoReleaseMessage release_msg;
   CdmResponseType status = decryptor_.GetUsageInfo(
       app_id, kDefaultCdmIdentifier, &usage_info);
-  EXPECT_EQ(usage_info.empty() ? NO_ERROR : KEY_MESSAGE, status);
+
+  EXPECT_EQ(KEY_MESSAGE, status);
+  ASSERT_FALSE(usage_info.empty());
 
   // Validate signed renewal request
   EXPECT_TRUE(signed_message.ParseFromString(usage_info[0]))
diff --git a/libwvdrmengine/run_all_unit_tests.sh b/libwvdrmengine/run_all_unit_tests.sh
index 2b022643..64f57b18 100755
--- a/libwvdrmengine/run_all_unit_tests.sh
+++ b/libwvdrmengine/run_all_unit_tests.sh
@@ -26,7 +26,7 @@ adb_shell_run() {
     echo "or begin execution by running ./build_and_run_all_unit_tests.sh"
     exit 1
   fi
-  echo $test_file
+  echo "------ Starting: $test_file"
   local tmp_log="$OUT/mediadrmtest.log"
   local adb_error="[ADB SHELL] $@ $test_file failed"
   adb shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log"