diff --git a/src/main/kotlin/g3501_3600/s3519_count_numbers_with_non_decreasing_digits/Solution.kt b/src/main/kotlin/g3501_3600/s3519_count_numbers_with_non_decreasing_digits/Solution.kt
index 566c76ef4..899e9af07 100644
--- a/src/main/kotlin/g3501_3600/s3519_count_numbers_with_non_decreasing_digits/Solution.kt
+++ b/src/main/kotlin/g3501_3600/s3519_count_numbers_with_non_decreasing_digits/Solution.kt
@@ -65,7 +65,7 @@ class Solution {
         while (i < n) {
             num[i] = arr[i++].code - '0'.code
         }
-        val temp: MutableList<Int?> = ArrayList<Int?>()
+        val temp: MutableList<Int> = ArrayList<Int>()
         var len = n
         while (len > 0) {
             var rem = 0
@@ -90,7 +90,7 @@ class Solution {
         var k = 0
         val size = temp.size
         while (k < size) {
-            res[k] = temp[size - 1 - k]!!
+            res[k] = temp[size - 1 - k]
             k++
         }
         return res
diff --git a/src/test/kotlin/g3301_3400/s3355_zero_array_transformation_i/SolutionTest.kt b/src/test/kotlin/g3301_3400/s3355_zero_array_transformation_i/SolutionTest.kt
index bfd91c14b..6bc42d209 100644
--- a/src/test/kotlin/g3301_3400/s3355_zero_array_transformation_i/SolutionTest.kt
+++ b/src/test/kotlin/g3301_3400/s3355_zero_array_transformation_i/SolutionTest.kt
@@ -1,6 +1,6 @@
 package g3301_3400.s3355_zero_array_transformation_i
 
-import org.hamcrest.CoreMatchers
+import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
@@ -10,7 +10,7 @@ internal class SolutionTest {
         assertThat<Boolean>(
             Solution()
                 .isZeroArray(intArrayOf(1, 0, 1), arrayOf<IntArray>(intArrayOf(0, 2))),
-            CoreMatchers.equalTo<Boolean>(true),
+            equalTo<Boolean>(true),
         )
     }
 
@@ -21,7 +21,7 @@ internal class SolutionTest {
                 intArrayOf(4, 3, 2, 1),
                 arrayOf<IntArray>(intArrayOf(1, 3), intArrayOf(0, 2)),
             ),
-            CoreMatchers.equalTo<Boolean>(false),
+            equalTo<Boolean>(false),
         )
     }
 
@@ -32,7 +32,7 @@ internal class SolutionTest {
                 intArrayOf(-1, 0, 1),
                 arrayOf<IntArray>(intArrayOf(1, 3), intArrayOf(0, 2)),
             ),
-            CoreMatchers.equalTo<Boolean>(true),
+            equalTo<Boolean>(true),
         )
     }
 }
diff --git a/src/test/kotlin/g3301_3400/s3380_maximum_area_rectangle_with_point_constraints_i/SolutionTest.kt b/src/test/kotlin/g3301_3400/s3380_maximum_area_rectangle_with_point_constraints_i/SolutionTest.kt
index e0ed9531b..c5780c67a 100644
--- a/src/test/kotlin/g3301_3400/s3380_maximum_area_rectangle_with_point_constraints_i/SolutionTest.kt
+++ b/src/test/kotlin/g3301_3400/s3380_maximum_area_rectangle_with_point_constraints_i/SolutionTest.kt
@@ -1,6 +1,6 @@
 package g3301_3400.s3380_maximum_area_rectangle_with_point_constraints_i
 
-import org.hamcrest.CoreMatchers
+import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
@@ -16,7 +16,7 @@ internal class SolutionTest {
                     intArrayOf(3, 3),
                 ),
             ),
-            CoreMatchers.equalTo<Int>(4),
+            equalTo<Int>(4),
         )
     }
 
@@ -33,7 +33,7 @@ internal class SolutionTest {
                         intArrayOf(2, 2),
                     ),
                 ),
-            CoreMatchers.equalTo<Int>(-1),
+            equalTo<Int>(-1),
         )
     }
 
@@ -51,7 +51,7 @@ internal class SolutionTest {
                         intArrayOf(3, 2),
                     ),
                 ),
-            CoreMatchers.equalTo<Int>(2),
+            equalTo<Int>(2),
         )
     }
 }
diff --git a/src/test/kotlin/g3401_3500/s3436_find_valid_emails/MysqlTest.kt b/src/test/kotlin/g3401_3500/s3436_find_valid_emails/MysqlTest.kt
index 86de7025f..7d83d542b 100644
--- a/src/test/kotlin/g3401_3500/s3436_find_valid_emails/MysqlTest.kt
+++ b/src/test/kotlin/g3401_3500/s3436_find_valid_emails/MysqlTest.kt
@@ -1,7 +1,7 @@
 package g3401_3500.s3436_find_valid_emails
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -48,19 +48,19 @@ internal class MysqlTest {
                         .collect(Collectors.joining("\n"))
                         .replace("#.*?\\r?\\n".toRegex(), ""),
                 ).use { resultSet ->
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<Int>(resultSet.getInt(1), CoreMatchers.equalTo<Int>(1))
-                    MatcherAssert.assertThat<String>(
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<Int>(resultSet.getInt(1), equalTo<Int>(1))
+                    assertThat<String>(
                         resultSet.getNString(2),
-                        CoreMatchers.equalTo<String>("alice@example.com"),
+                        equalTo<String>("alice@example.com"),
                     )
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<Int>(resultSet.getInt(1), CoreMatchers.equalTo<Int>(4))
-                    MatcherAssert.assertThat<String>(
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<Int>(resultSet.getInt(1), equalTo<Int>(4))
+                    assertThat<String>(
                         resultSet.getNString(2),
-                        CoreMatchers.equalTo<String>("david@domain.com"),
+                        equalTo<String>("david@domain.com"),
                     )
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }
diff --git a/src/test/kotlin/g3401_3500/s3484_design_spreadsheet/SpreadsheetTest.kt b/src/test/kotlin/g3401_3500/s3484_design_spreadsheet/SpreadsheetTest.kt
index cbeabf3f0..42851e7ed 100644
--- a/src/test/kotlin/g3401_3500/s3484_design_spreadsheet/SpreadsheetTest.kt
+++ b/src/test/kotlin/g3401_3500/s3484_design_spreadsheet/SpreadsheetTest.kt
@@ -1,7 +1,7 @@
 package g3401_3500.s3484_design_spreadsheet
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SpreadsheetTest {
@@ -10,18 +10,18 @@ internal class SpreadsheetTest {
         // Initializes a spreadsheet with 3 rows and 26 columns
         val spreadsheet = Spreadsheet(3)
         // returns 12 (5+7)
-        MatcherAssert.assertThat<Int>(spreadsheet.getValue("=5+7"), CoreMatchers.equalTo<Int>(12))
+        assertThat<Int>(spreadsheet.getValue("=5+7"), equalTo<Int>(12))
         // sets A1 to 10
         spreadsheet.setCell("A1", 10)
         // returns 16 (10+6)
-        MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+6"), CoreMatchers.equalTo<Int>(16))
+        assertThat<Int>(spreadsheet.getValue("=A1+6"), equalTo<Int>(16))
         // sets B2 to 15
         spreadsheet.setCell("B2", 15)
         // returns 25 (10+15)
-        MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+B2"), CoreMatchers.equalTo<Int>(25))
+        assertThat<Int>(spreadsheet.getValue("=A1+B2"), equalTo<Int>(25))
         // resets A1 to 0
         spreadsheet.resetCell("A1")
         // returns 15 (0+15)
-        MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+B2"), CoreMatchers.equalTo<Int>(15))
+        assertThat<Int>(spreadsheet.getValue("=A1+B2"), equalTo<Int>(15))
     }
 }
diff --git a/src/test/kotlin/g3401_3500/s3497_analyze_subscription_conversion/MysqlTest.kt b/src/test/kotlin/g3401_3500/s3497_analyze_subscription_conversion/MysqlTest.kt
index 888596675..afe30aceb 100644
--- a/src/test/kotlin/g3401_3500/s3497_analyze_subscription_conversion/MysqlTest.kt
+++ b/src/test/kotlin/g3401_3500/s3497_analyze_subscription_conversion/MysqlTest.kt
@@ -1,7 +1,7 @@
 package g3401_3500.s3497_analyze_subscription_conversion
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -72,7 +72,7 @@ internal class MysqlTest {
                     checkRow(resultSet, arrayOf<String>("1", "45.0", "76.67"))
                     checkRow(resultSet, arrayOf<String>("3", "70.0", "63.33"))
                     checkRow(resultSet, arrayOf<String>("4", "37.5", "45.0"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }
@@ -80,9 +80,9 @@ internal class MysqlTest {
 
     @Throws(SQLException::class)
     private fun checkRow(resultSet: ResultSet, values: Array<String>) {
-        MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-        MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>(values[0]))
-        MatcherAssert.assertThat<String>(resultSet.getNString(2), CoreMatchers.equalTo<String>(values[1]))
-        MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>(values[2]))
+        assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+        assertThat<String>(resultSet.getNString(1), equalTo<String>(values[0]))
+        assertThat<String>(resultSet.getNString(2), equalTo<String>(values[1]))
+        assertThat<String>(resultSet.getNString(3), equalTo<String>(values[2]))
     }
 }
diff --git a/src/test/kotlin/g3501_3600/s3521_find_product_recommendation_pairs/MysqlTest.kt b/src/test/kotlin/g3501_3600/s3521_find_product_recommendation_pairs/MysqlTest.kt
index dd88b7b5b..eac7b3146 100644
--- a/src/test/kotlin/g3501_3600/s3521_find_product_recommendation_pairs/MysqlTest.kt
+++ b/src/test/kotlin/g3501_3600/s3521_find_product_recommendation_pairs/MysqlTest.kt
@@ -1,7 +1,7 @@
 package g3501_3600.s3521_find_product_recommendation_pairs
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -78,7 +78,7 @@ internal class MysqlTest {
                     checkRow(resultSet, arrayOf<String>("101", "102", "Electronics", "Books", "3"))
                     checkRow(resultSet, arrayOf<String>("101", "103", "Electronics", "Clothing", "3"))
                     checkRow(resultSet, arrayOf<String>("102", "104", "Books", "Clothing", "3"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }
@@ -86,9 +86,9 @@ internal class MysqlTest {
 
     @Throws(SQLException::class)
     private fun checkRow(resultSet: ResultSet, values: Array<String>) {
-        MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-        MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>(values[0]))
-        MatcherAssert.assertThat<String>(resultSet.getNString(2), CoreMatchers.equalTo<String>(values[1]))
-        MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>(values[2]))
+        assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+        assertThat<String>(resultSet.getNString(1), equalTo<String>(values[0]))
+        assertThat<String>(resultSet.getNString(2), equalTo<String>(values[1]))
+        assertThat<String>(resultSet.getNString(3), equalTo<String>(values[2]))
     }
 }
diff --git a/src/test/kotlin/g3501_3600/s3542_minimum_operations_to_convert_all_elements_to_zero/SolutionTest.kt b/src/test/kotlin/g3501_3600/s3542_minimum_operations_to_convert_all_elements_to_zero/SolutionTest.kt
index 9ecd8e754..73672b18a 100644
--- a/src/test/kotlin/g3501_3600/s3542_minimum_operations_to_convert_all_elements_to_zero/SolutionTest.kt
+++ b/src/test/kotlin/g3501_3600/s3542_minimum_operations_to_convert_all_elements_to_zero/SolutionTest.kt
@@ -1,25 +1,25 @@
 package g3501_3600.s3542_minimum_operations_to_convert_all_elements_to_zero
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SolutionTest {
     @Test
     fun minOperations() {
-        MatcherAssert.assertThat<Int>(Solution().minOperations(intArrayOf(0, 2)), CoreMatchers.equalTo<Int>(1))
+        assertThat<Int>(Solution().minOperations(intArrayOf(0, 2)), equalTo<Int>(1))
     }
 
     @Test
     fun minOperations2() {
-        MatcherAssert.assertThat<Int>(Solution().minOperations(intArrayOf(3, 1, 2, 1)), CoreMatchers.equalTo<Int>(3))
+        assertThat<Int>(Solution().minOperations(intArrayOf(3, 1, 2, 1)), equalTo<Int>(3))
     }
 
     @Test
     fun minOperations3() {
-        MatcherAssert.assertThat<Int>(
+        assertThat<Int>(
             Solution().minOperations(intArrayOf(1, 2, 1, 2, 1, 2)),
-            CoreMatchers.equalTo<Int>(4),
+            equalTo<Int>(4),
         )
     }
 }
diff --git a/src/test/kotlin/g3601_3700/s3633_earliest_finish_time_for_land_and_water_rides_i/SolutionTest.kt b/src/test/kotlin/g3601_3700/s3633_earliest_finish_time_for_land_and_water_rides_i/SolutionTest.kt
index 7d5c569f5..dee614562 100644
--- a/src/test/kotlin/g3601_3700/s3633_earliest_finish_time_for_land_and_water_rides_i/SolutionTest.kt
+++ b/src/test/kotlin/g3601_3700/s3633_earliest_finish_time_for_land_and_water_rides_i/SolutionTest.kt
@@ -1,13 +1,13 @@
 package g3601_3700.s3633_earliest_finish_time_for_land_and_water_rides_i
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SolutionTest {
     @Test
     fun earliestFinishTime() {
-        MatcherAssert.assertThat<Int?>(
+        assertThat<Int>(
             Solution()
                 .earliestFinishTime(
                     intArrayOf(2, 8),
@@ -15,13 +15,13 @@ internal class SolutionTest {
                     intArrayOf(6),
                     intArrayOf(3),
                 ),
-            CoreMatchers.equalTo<Int?>(9),
+            equalTo<Int>(9),
         )
     }
 
     @Test
     fun earliestFinishTime2() {
-        MatcherAssert.assertThat<Int?>(
+        assertThat<Int>(
             Solution()
                 .earliestFinishTime(
                     intArrayOf(5),
@@ -29,7 +29,7 @@ internal class SolutionTest {
                     intArrayOf(1),
                     intArrayOf(10),
                 ),
-            CoreMatchers.equalTo<Int?>(14),
+            equalTo<Int>(14),
         )
     }
 }
diff --git a/src/test/kotlin/g3601_3700/s3643_flip_square_submatrix_vertically/SolutionTest.kt b/src/test/kotlin/g3601_3700/s3643_flip_square_submatrix_vertically/SolutionTest.kt
index 4a5896852..0ed3f52fd 100644
--- a/src/test/kotlin/g3601_3700/s3643_flip_square_submatrix_vertically/SolutionTest.kt
+++ b/src/test/kotlin/g3601_3700/s3643_flip_square_submatrix_vertically/SolutionTest.kt
@@ -1,13 +1,13 @@
 package g3601_3700.s3643_flip_square_submatrix_vertically
 
 import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.MatcherAssert
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SolutionTest {
     @Test
     fun reverseSubmatrix() {
-        MatcherAssert.assertThat<Array<IntArray>>(
+        assertThat<Array<IntArray>>(
             Solution()
                 .reverseSubmatrix(
                     arrayOf<IntArray>(
@@ -33,7 +33,7 @@ internal class SolutionTest {
 
     @Test
     fun reverseSubmatrix2() {
-        MatcherAssert.assertThat<Array<IntArray>>(
+        assertThat<Array<IntArray>>(
             Solution().reverseSubmatrix(arrayOf<IntArray>(intArrayOf(3, 4, 2, 3), intArrayOf(2, 3, 4, 2)), 0, 2, 2),
             equalTo<Array<IntArray>>(arrayOf<IntArray>(intArrayOf(3, 4, 4, 2), intArrayOf(2, 3, 2, 3))),
         )
diff --git a/src/test/kotlin/g3601_3700/s3680_generate_schedule/SolutionTest.kt b/src/test/kotlin/g3601_3700/s3680_generate_schedule/SolutionTest.kt
index 30a4becb2..c43c6e371 100644
--- a/src/test/kotlin/g3601_3700/s3680_generate_schedule/SolutionTest.kt
+++ b/src/test/kotlin/g3601_3700/s3680_generate_schedule/SolutionTest.kt
@@ -1,20 +1,20 @@
 package g3601_3700.s3680_generate_schedule
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 
 internal class SolutionTest {
     @Test
     fun generateSchedule() {
-        MatcherAssert.assertThat<Array<IntArray>>(Solution().generateSchedule(3), CoreMatchers.equalTo(intArrayOf()))
+        assertThat<Array<IntArray>>(Solution().generateSchedule(3), equalTo(intArrayOf()))
     }
 
     @Test
     fun generateSchedule2() {
-        MatcherAssert.assertThat<Array<IntArray>>(
+        assertThat<Array<IntArray>>(
             Solution().generateSchedule(5),
-            CoreMatchers.equalTo<Array<IntArray>>(
+            equalTo<Array<IntArray>>(
                 arrayOf<IntArray>(
                     intArrayOf(0, 2),
                     intArrayOf(1, 3),
diff --git a/src/test/kotlin/g3701_3800/s3705_find_golden_hour_customers/MysqlTest.kt b/src/test/kotlin/g3701_3800/s3705_find_golden_hour_customers/MysqlTest.kt
index f29c841bf..cec7bef55 100644
--- a/src/test/kotlin/g3701_3800/s3705_find_golden_hour_customers/MysqlTest.kt
+++ b/src/test/kotlin/g3701_3800/s3705_find_golden_hour_customers/MysqlTest.kt
@@ -1,7 +1,7 @@
 package g3701_3800.s3705_find_golden_hour_customers
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -66,22 +66,22 @@ internal class MysqlTest {
                         .collect(Collectors.joining("\n"))
                         .replace("#.*?\\r?\\n".toRegex(), ""),
                 ).use { resultSet ->
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getString(1), CoreMatchers.equalTo<String>("103"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(2), CoreMatchers.equalTo<String>("3"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(3), CoreMatchers.equalTo<String>("100"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(4), CoreMatchers.equalTo<String>("4.67"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getString(1), CoreMatchers.equalTo<String>("101"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(2), CoreMatchers.equalTo<String>("4"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(3), CoreMatchers.equalTo<String>("100"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(4), CoreMatchers.equalTo<String>("4.67"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getString(1), CoreMatchers.equalTo<String>("105"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(2), CoreMatchers.equalTo<String>("3"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(3), CoreMatchers.equalTo<String>("100"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(4), CoreMatchers.equalTo<String>("4.33"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getString(1), equalTo<String>("103"))
+                    assertThat<String>(resultSet.getString(2), equalTo<String>("3"))
+                    assertThat<String>(resultSet.getString(3), equalTo<String>("100"))
+                    assertThat<String>(resultSet.getString(4), equalTo<String>("4.67"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getString(1), equalTo<String>("101"))
+                    assertThat<String>(resultSet.getString(2), equalTo<String>("4"))
+                    assertThat<String>(resultSet.getString(3), equalTo<String>("100"))
+                    assertThat<String>(resultSet.getString(4), equalTo<String>("4.67"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getString(1), equalTo<String>("105"))
+                    assertThat<String>(resultSet.getString(2), equalTo<String>("3"))
+                    assertThat<String>(resultSet.getString(3), equalTo<String>("100"))
+                    assertThat<String>(resultSet.getString(4), equalTo<String>("4.33"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }
diff --git a/src/test/kotlin/g3701_3800/s3716_find_churn_risk_customers/MysqlTest.kt b/src/test/kotlin/g3701_3800/s3716_find_churn_risk_customers/MysqlTest.kt
index 0eb365df9..279fe9840 100644
--- a/src/test/kotlin/g3701_3800/s3716_find_churn_risk_customers/MysqlTest.kt
+++ b/src/test/kotlin/g3701_3800/s3716_find_churn_risk_customers/MysqlTest.kt
@@ -1,7 +1,7 @@
 package g3701_3800.s3716_find_churn_risk_customers
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -67,19 +67,19 @@ internal class MysqlTest {
                         .collect(Collectors.joining("\n"))
                         .replace("#.*?\\r?\\n".toRegex(), ""),
                 ).use { resultSet ->
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getString(1), CoreMatchers.equalTo<String>("501"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(2), CoreMatchers.equalTo<String>("basic"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(3), CoreMatchers.equalTo<String>("9.99"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(4), CoreMatchers.equalTo<String>("29.99"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(5), CoreMatchers.equalTo<String>("79"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getString(1), CoreMatchers.equalTo<String>("502"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(2), CoreMatchers.equalTo<String>("basic"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(3), CoreMatchers.equalTo<String>("9.99"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(4), CoreMatchers.equalTo<String>("29.99"))
-                    MatcherAssert.assertThat<String>(resultSet.getString(5), CoreMatchers.equalTo<String>("70"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getString(1), equalTo<String>("501"))
+                    assertThat<String>(resultSet.getString(2), equalTo<String>("basic"))
+                    assertThat<String>(resultSet.getString(3), equalTo<String>("9.99"))
+                    assertThat<String>(resultSet.getString(4), equalTo<String>("29.99"))
+                    assertThat<String>(resultSet.getString(5), equalTo<String>("79"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getString(1), equalTo<String>("502"))
+                    assertThat<String>(resultSet.getString(2), equalTo<String>("basic"))
+                    assertThat<String>(resultSet.getString(3), equalTo<String>("9.99"))
+                    assertThat<String>(resultSet.getString(4), equalTo<String>("29.99"))
+                    assertThat<String>(resultSet.getString(5), equalTo<String>("70"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }