diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache
index d33c166d10e..ad8b33bfbff 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/api_test.mustache
@@ -3,7 +3,6 @@ package {{package}}
 {{#imports}}import {{import}}
 {{/imports}}
 import org.junit.jupiter.api.Test
-
 {{#reactive}}
 import kotlinx.coroutines.flow.Flow;
 import kotlinx.coroutines.test.runBlockingTest
@@ -12,26 +11,29 @@ import org.springframework.http.ResponseEntity
 
 class {{classname}}Test {
 
-    {{#serviceInterface}}private val service: {{classname}}Service = {{classname}}ServiceImpl(){{/serviceInterface}}
+    {{#serviceInterface}}
+    private val service: {{classname}}Service = {{classname}}ServiceImpl()
+    {{/serviceInterface}}
     private val api: {{classname}}Controller = {{classname}}Controller({{#serviceInterface}}service{{/serviceInterface}})
 
-    {{#operations}}{{#operation}}
+    {{#operations}}
+    {{#operation}}
     /**
-    * {{summary}}
-    *
-    * {{notes}}
-    *
-    * @throws ApiException
-    *          if the Api call fails
-    */
+     * To test {{classname}}Controller.{{operationId}}
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
     @Test
     fun {{operationId}}Test() {{#reactive}}= runBlockingTest {{/reactive}}{
         {{#allParams}}
         val {{paramName}}:{{{dataType}}}? = null
         {{/allParams}}
-        val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{paramName}}!!{{^-last}}, {{/-last}}{{/allParams}})
+        val response: ResponseEntity<{{>returnTypes}}> = api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}})
 
         // TODO: test validations
     }
-    {{/operation}}{{/operations}}
+
+    {{/operation}}
+    {{/operations}}
 }