diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/EntityExtTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/EntityExtTest.kt
index 7d200a9905..61df8dbd3d 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/EntityExtTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/EntityExtTest.kt
@@ -1,10 +1,10 @@
 package com.almasb.fxgl.entity
 
 import com.almasb.fxgl.entity.component.Component
+import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.hamcrest.CoreMatchers.*
-import org.hamcrest.MatcherAssert.assertThat
 
 internal class EntityExtTest {
     private lateinit var entity: Entity
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/GameWorldTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/GameWorldTest.kt
index e4dfc4d110..d45e5a0b3c 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/GameWorldTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/GameWorldTest.kt
@@ -6,8 +6,6 @@
 @file:Suppress("JAVA_MODULE_DOES_NOT_DEPEND_ON_MODULE")
 package com.almasb.fxgl.entity
 
-import java.util.Optional
-import java.util.function.Predicate
 import com.almasb.fxgl.entity.component.Component
 import com.almasb.fxgl.entity.components.*
 import com.almasb.fxgl.entity.level.Level
@@ -28,6 +26,8 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.function.Executable
+import java.util.*
+import java.util.function.Predicate
 
 class GameWorldTest {
 
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/action/ActionComponentTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/action/ActionComponentTest.kt
index e32b1ba569..592eb368d4 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/action/ActionComponentTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/action/ActionComponentTest.kt
@@ -6,8 +6,6 @@
 
 package com.almasb.fxgl.entity.action
 
-import com.almasb.fxgl.core.serialization.Bundle
-import javafx.geometry.Point2D
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.*
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/components/TransformComponentTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/components/TransformComponentTest.kt
index 6da65b9223..66302ef579 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/components/TransformComponentTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/components/TransformComponentTest.kt
@@ -11,8 +11,7 @@ import javafx.geometry.Point2D
 import javafx.geometry.Point3D
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.number.IsCloseTo
-import org.hamcrest.number.IsCloseTo.*
+import org.hamcrest.number.IsCloseTo.closeTo
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/state/StateComponentTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/state/StateComponentTest.kt
index 3f71db08be..55eadc2ca5 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/state/StateComponentTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/entity/state/StateComponentTest.kt
@@ -9,8 +9,8 @@ package com.almasb.fxgl.entity.state
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.containsString
 import org.hamcrest.MatcherAssert.assertThat
-import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/pathfinding/astar/AStarPathfinderTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/pathfinding/astar/AStarPathfinderTest.kt
index c3ecc40d36..765b55b426 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/pathfinding/astar/AStarPathfinderTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/pathfinding/astar/AStarPathfinderTest.kt
@@ -9,7 +9,6 @@ import com.almasb.fxgl.pathfinding.CellState
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.util.*
 import java.util.function.Supplier
 
 class AStarPathfinderTest {
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/HitBoxTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/HitBoxTest.kt
index 249e834a43..1eab98db69 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/HitBoxTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/HitBoxTest.kt
@@ -15,11 +15,6 @@ import org.hamcrest.Matchers
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
-import java.io.ByteArrayOutputStream
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
 import java.util.stream.Stream
 
 
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/CircleShapeTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/CircleShapeTest.kt
index 5f15a1696a..bfe95be612 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/CircleShapeTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/CircleShapeTest.kt
@@ -11,8 +11,6 @@ import com.almasb.fxgl.physics.box2d.collision.AABB
 import com.almasb.fxgl.physics.box2d.common.Transform
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
-import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
diff --git a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/PolygonShapeTest.kt b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/PolygonShapeTest.kt
index 3406569966..e6526e9fc6 100644
--- a/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/PolygonShapeTest.kt
+++ b/fxgl-entity/src/test/kotlin/com/almasb/fxgl/physics/box2d/collision/shapes/PolygonShapeTest.kt
@@ -11,11 +11,8 @@ import com.almasb.fxgl.physics.box2d.collision.AABB
 import com.almasb.fxgl.physics.box2d.common.Transform
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
-import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import java.util.*
 
 /**
  *