diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88f52f2..4e632fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,10 +40,10 @@ jobs:
         run: chmod +x gradlew
 
       - name: Build plugin
-        run: ./gradlew buildPlugin
+        run: ./gradlew buildPlugin --stacktrace
 
       - name: Run tests
-        run: ./gradlew test
+        run: ./gradlew test --stacktrace
 
       - name: Upload test results
         if: always()
@@ -84,10 +84,10 @@ jobs:
         run: chmod +x gradlew
 
       - name: Verify plugin descriptor
-        run: ./gradlew verifyPluginConfiguration
+        run: ./gradlew verifyPluginConfiguration --stacktrace
 
       - name: Build plugin distribution
-        run: ./gradlew buildPlugin
+        run: ./gradlew buildPlugin --stacktrace
 
       - name: Upload plugin artifact
         uses: actions/upload-artifact@v4
diff --git a/review-plugin/build.gradle.kts b/review-plugin/build.gradle.kts
index 5921492..937376d 100644
--- a/review-plugin/build.gradle.kts
+++ b/review-plugin/build.gradle.kts
@@ -21,9 +21,9 @@ kotlin {
 dependencies {
     intellijPlatform {
         intellijIdeaCommunity("2024.1")
-        bundledPlugin("com.intellij.java")
         pluginVerifier()
         instrumentationTools()
+        testFramework(org.jetbrains.intellij.platform.gradle.TestFrameworkType.Platform)
     }
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
     testImplementation(kotlin("test"))
@@ -31,7 +31,6 @@ dependencies {
 }
 
 intellijPlatform {
-    buildSearchableOptions = false
     pluginConfiguration {
         id = "com.reviewplugin"
         name = "Agent Review"
@@ -52,4 +51,7 @@ tasks {
     test {
         useJUnit()
     }
+    buildSearchableOptions {
+        enabled = false
+    }
 }
diff --git a/review-plugin/settings.gradle.kts b/review-plugin/settings.gradle.kts
index 23c6e41..5b03c42 100644
--- a/review-plugin/settings.gradle.kts
+++ b/review-plugin/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 rootProject.name = "review-plugin"
diff --git a/review-plugin/src/test/kotlin/com/reviewplugin/anchor/HunkMatcherTest.kt b/review-plugin/src/test/kotlin/com/reviewplugin/anchor/HunkMatcherTest.kt
index 093f29b..d86fd8b 100644
--- a/review-plugin/src/test/kotlin/com/reviewplugin/anchor/HunkMatcherTest.kt
+++ b/review-plugin/src/test/kotlin/com/reviewplugin/anchor/HunkMatcherTest.kt
@@ -159,7 +159,7 @@ class HunkMatcherTest {
         """.trimIndent()
         // After first hunk: offset = (2+3)-(2+2) = 1
         // Old line 5 is between hunks → 5 - 1 + 1 = 5 (0-based)
-        assertEquals(5, HunkMatcher.parseDiffAndRemap(diff, 6))
+        assertEquals(5, HunkMatcher.parseDiffAndRemap(diff, 5))
     }
 
     @Test
@@ -174,7 +174,7 @@ class HunkMatcherTest {
         // Old line 5 is in the hunk (5..5)
         assertNull(HunkMatcher.parseDiffAndRemap(diff, 5))
         // Old line 6 is after: offset = (5+2)-(5+1) = 1, result = 6-1+1 = 6
-        assertEquals(6, HunkMatcher.parseDiffAndRemap(diff, 7))
+        assertEquals(6, HunkMatcher.parseDiffAndRemap(diff, 6))
     }
 
     // ── fuzzySearch ─────────────────────────────────────────────────