diff --git a/.yamato/xray-exemptions.json b/.yamato/xray-exemptions.json
index 2c63c08..407f5e9 100644
--- a/.yamato/xray-exemptions.json
+++ b/.yamato/xray-exemptions.json
@@ -1,2 +1,15 @@
 {
+  "per_package": {
+    "com.unity.mobile.android-logcat@1": {
+      "exempts": {
+        "PVP-92-3": {
+          "errors": [
+            "Editor/AndroidTools/AndroidTools.cs: \"llvm-nm\"",
+            "Editor/AndroidTools/AndroidTools.cs: \"llvm-addr2line\"",
+            "Editor/AndroidTools/AndroidTools.cs: \"llvm-readelf\""
+          ]
+        }
+      }
+    }
+  }
 }
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatDispatcherTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatDispatcherTests.cs
index 7208870..3445f27 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatDispatcherTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatDispatcherTests.cs
@@ -7,7 +7,7 @@ using Unity.Android.Logcat;
 using UnityEngine;
 using UnityEngine.TestTools;
 
-public class AndroidLogcatDispatcherTests
+class AndroidLogcatDispatcherTests
 {
     internal struct TaskInputData : IAndroidLogcatTaskInput
     {
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatFastListViewTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatFastListViewTests.cs
index 61478f7..b8527ca 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatFastListViewTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatFastListViewTests.cs
@@ -2,7 +2,7 @@ using NUnit.Framework;
 using System;
 using Unity.Android.Logcat;
 
-public class AndroidLogcatFastListViewTests
+class AndroidLogcatFastListViewTests
 {
     [Test]
     public void CanClearItems()
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatGeneralTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatGeneralTests.cs
index 53eb026..23364e5 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatGeneralTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatGeneralTests.cs
@@ -5,7 +5,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Unity.Android.Logcat;
 
-public class AndroidLogcatGeneralTests
+class AndroidLogcatGeneralTests
 {
     [Test]
     public void ParseVersionTests()
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatMemoryTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatMemoryTests.cs
index 62b3f52..39c5c67 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatMemoryTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatMemoryTests.cs
@@ -2,7 +2,7 @@ using NUnit.Framework;
 using System;
 using Unity.Android.Logcat;
 
-public class AndroidLogcatMemoryTests
+class AndroidLogcatMemoryTests
 {
     const int kKiloByte = 1000;
 
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs
index d23741c..7143308 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs
@@ -8,7 +8,7 @@ using UnityEditor;
 using UnityEditor.Compilation;
 using Assembly = System.Reflection.Assembly;
 
-public class AndroidLogcatNetTests
+class AndroidLogcatNetTests
 {
     // Ensure we're running tests with .NET 3.5, because Unity 2018.3 and older don't have .NET 3.5 deprecated
     [Test]
@@ -104,7 +104,7 @@ public class AndroidLogcatNetTests
     }
 
     /// <summary>
-    /// Check that we don't have unexpected using <namespace>;
+    /// Check that we don't have unexpected using namespace
     /// For ex., using using NUnit.Framework is not valid
     /// This test is not perfect since you can access classes from those namespaces without using, but it's better than nothing
     /// </summary>
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatStacktraceTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatStacktraceTests.cs
index d5376e0..c26366f 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatStacktraceTests.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatStacktraceTests.cs
@@ -5,7 +5,7 @@ using Unity.Android.Logcat;
 using System.IO;
 using System.Text.RegularExpressions;
 
-public class AndroidLogcatStacktraceTests
+class AndroidLogcatStacktraceTests
 {
     static string GetSymbolAddressUsingNM(AndroidTools tools, string symbolFilePath, string symbolName)
     {
diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatTestsSetup.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatTestsSetup.cs
index 22a5e18..b3d262f 100644
--- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatTestsSetup.cs
+++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatTestsSetup.cs
@@ -7,7 +7,7 @@ using UnityEditor;
 using System;
 
 [InitializeOnLoad]
-public class AndroidLogcatTestsSetup
+class AndroidLogcatTestsSetup
 {
     public static bool AndroidSDKAndNDKAvailable()
     {