diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/score/CloudBalancingConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/score/CloudBalancingConstraintProviderTest.java
index bdd011e0..42fe8877 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/score/CloudBalancingConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/score/CloudBalancingConstraintProviderTest.java
@@ -5,7 +5,7 @@
 import ai.timefold.solver.benchmarks.examples.cloudbalancing.domain.CloudProcess;
 import ai.timefold.solver.benchmarks.examples.common.score.AbstractConstraintProviderTest;
 import ai.timefold.solver.benchmarks.examples.common.score.ConstraintProviderTest;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class CloudBalancingConstraintProviderTest
         extends
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/AbstractConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/AbstractConstraintProviderTest.java
index 5a319f07..afa9f371 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/AbstractConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/AbstractConstraintProviderTest.java
@@ -7,7 +7,7 @@
 import java.util.stream.Stream;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintProvider;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.TestInstance;
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/ConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/ConstraintProviderTest.java
index b03d6899..2fd1712b 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/ConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/common/score/ConstraintProviderTest.java
@@ -3,18 +3,20 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * Tests using {@link ai.timefold.solver.test.api.score.stream.ConstraintVerifier} should use this annotation
- * instead of @{@link org.junit.jupiter.api.Test}.
+ * Tests using {@link ConstraintVerifier} should use this annotation
+ * instead of @{@link Test}.
  * This brings several benefits, such as parallel execution and testing.
  *
  * <p>
- * Each such test expects exactly one argument of type {@link ai.timefold.solver.test.api.score.stream.ConstraintVerifier}.
+ * Each such test expects exactly one argument of type {@link ConstraintVerifier}.
  * Values for that argument are read from {@link AbstractConstraintProviderTest#getConstraintVerifierImpl()}.
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java
index 945c5229..e32cfeeb 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/score/ConferenceSchedulingConstraintProviderTest.java
@@ -16,7 +16,7 @@
 import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.Speaker;
 import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.Talk;
 import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.Timeslot;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class ConferenceSchedulingConstraintProviderTest
         extends
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/score/CurriculumCourseConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/score/CurriculumCourseConstraintProviderTest.java
index 7d1eff7b..260049cf 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/score/CurriculumCourseConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/score/CurriculumCourseConstraintProviderTest.java
@@ -13,7 +13,7 @@
 import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.Timeslot;
 import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.UnavailablePeriodPenalty;
 import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.solver.CourseConflict;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class CurriculumCourseConstraintProviderTest
         extends
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/examination/score/ExaminationConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/examination/score/ExaminationConstraintProviderTest.java
index 9e52c75a..a1f52f19 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/examination/score/ExaminationConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/examination/score/ExaminationConstraintProviderTest.java
@@ -15,7 +15,7 @@
 import ai.timefold.solver.benchmarks.examples.examination.domain.Student;
 import ai.timefold.solver.benchmarks.examples.examination.domain.Topic;
 import ai.timefold.solver.benchmarks.examples.examination.domain.solver.TopicConflict;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class ExaminationConstraintProviderTest
         extends
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/machinereassignment/score/MachineReassignmentConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/machinereassignment/score/MachineReassignmentConstraintProviderTest.java
index adff4cd4..8b674257 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/machinereassignment/score/MachineReassignmentConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/machinereassignment/score/MachineReassignmentConstraintProviderTest.java
@@ -26,7 +26,7 @@
 import ai.timefold.solver.benchmarks.examples.machinereassignment.domain.solver.MrServiceDependency;
 import ai.timefold.solver.benchmarks.examples.machinereassignment.persistence.MachineReassignmentSolutionFileIO;
 import ai.timefold.solver.core.api.score.HardSoftScore;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class MachineReassignmentConstraintProviderTest
         extends AbstractConstraintProviderTest<MachineReassignmentConstraintProvider, MachineReassignment> {
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/score/MeetingSchedulingConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/score/MeetingSchedulingConstraintProviderTest.java
index 9750006b..442a7919 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/score/MeetingSchedulingConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/score/MeetingSchedulingConstraintProviderTest.java
@@ -14,7 +14,7 @@
 import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.RequiredAttendance;
 import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.Room;
 import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.TimeGrain;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class MeetingSchedulingConstraintProviderTest
         extends AbstractConstraintProviderTest<MeetingSchedulingConstraintProvider, MeetingSchedule> {
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/nurserostering/score/NurseRosteringConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/nurserostering/score/NurseRosteringConstraintProviderTest.java
index af519132..e4690738 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/nurserostering/score/NurseRosteringConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/nurserostering/score/NurseRosteringConstraintProviderTest.java
@@ -33,8 +33,8 @@
 import ai.timefold.solver.benchmarks.examples.nurserostering.domain.request.DayOnRequest;
 import ai.timefold.solver.benchmarks.examples.nurserostering.domain.request.ShiftOffRequest;
 import ai.timefold.solver.benchmarks.examples.nurserostering.domain.request.ShiftOnRequest;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
-import ai.timefold.solver.test.api.score.stream.SingleConstraintVerification;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.SingleConstraintVerification;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/pas/score/PatientAdmissionScheduleConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/pas/score/PatientAdmissionScheduleConstraintProviderTest.java
index b81d88fb..4e17e5b4 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/pas/score/PatientAdmissionScheduleConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/pas/score/PatientAdmissionScheduleConstraintProviderTest.java
@@ -24,7 +24,7 @@
 import ai.timefold.solver.benchmarks.examples.pas.domain.Specialism;
 import ai.timefold.solver.core.api.score.stream.Constraint;
 import ai.timefold.solver.core.api.score.stream.ConstraintFactory;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/score/VehicleRoutingConstraintProviderTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/score/VehicleRoutingConstraintProviderTest.java
index bf685c1e..9bd04c56 100644
--- a/src/test/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/score/VehicleRoutingConstraintProviderTest.java
+++ b/src/test/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/score/VehicleRoutingConstraintProviderTest.java
@@ -12,7 +12,7 @@
 import ai.timefold.solver.benchmarks.examples.vehiclerouting.domain.location.Location;
 import ai.timefold.solver.benchmarks.examples.vehiclerouting.domain.timewindowed.TimeWindowedCustomer;
 import ai.timefold.solver.benchmarks.examples.vehiclerouting.domain.timewindowed.TimeWindowedDepot;
-import ai.timefold.solver.test.api.score.stream.ConstraintVerifier;
+import ai.timefold.solver.core.api.score.stream.test.ConstraintVerifier;
 
 class VehicleRoutingConstraintProviderTest
         extends