diff --git a/refaster-runner/src/test/java/tech/picnic/errorprone/refaster/runner/RefasterTest.java b/refaster-runner/src/test/java/tech/picnic/errorprone/refaster/runner/RefasterTest.java
index 7239a2751b0..3202849d01d 100644
--- a/refaster-runner/src/test/java/tech/picnic/errorprone/refaster/runner/RefasterTest.java
+++ b/refaster-runner/src/test/java/tech/picnic/errorprone/refaster/runner/RefasterTest.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Predicates.containsPattern;
 import static com.google.common.collect.ImmutableSortedMap.toImmutableSortedMap;
-import static com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode.TEXT_MATCH;
 import static java.util.Comparator.naturalOrder;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -10,6 +9,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.errorprone.BugCheckerRefactoringTestHelper;
+import com.google.errorprone.BugCheckerRefactoringTestHelper.TestMode;
 import com.google.errorprone.CompilationTestHelper;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
@@ -107,8 +107,8 @@ private static Stream<Arguments> reportedSeverityTestCases() {
    * Verifies that the bug checker flags the refactoring opportunities with the appropriate severity
    * level.
    *
-   * @implNote This test setup is rather awkward, because {@link CompilationTestHelper} does not
-   *     enable direct assertions against the severity of collected diagnostics output.
+   * @implNote This test setup is rather cumbersome, because the {@link CompilationTestHelper} does
+   *     not enable direct assertions against the severity of collected diagnostics output.
    */
   @MethodSource("reportedSeverityTestCases")
   @ParameterizedTest
@@ -175,7 +175,7 @@ void replacement() {
             "    boolean b4 = \"qux\".length() == 3;",
             "  }",
             "}")
-        .doTest(TEXT_MATCH);
+        .doTest(TestMode.TEXT_MATCH);
   }
 
   @Test
@@ -201,6 +201,6 @@ void restrictedReplacement() {
             "    boolean b4 = \"qux\".toCharArray().length == 3;",
             "  }",
             "}")
-        .doTest(TEXT_MATCH);
+        .doTest(TestMode.TEXT_MATCH);
   }
 }
diff --git a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java
index b829101a805..3169332926b 100644
--- a/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java
+++ b/refaster-support/src/main/java/tech/picnic/errorprone/refaster/annotation/package-info.java
@@ -1,5 +1,5 @@
 /**
- * A collection annotations that may be placed on Refaster template classes and Refaster template
+ * A collection of annotations that may be placed on Refaster template classes and Refaster template
  * collection classes, thus influencing the way in which associated template matches are reported in
  * non-patch mode.
  */