diff --git a/plugins/stream-debugger/testData/dsl/java/linkedMapDeclaration.out b/plugins/stream-debugger/testData/dsl/java/linkedMapDeclaration.out
index 7aca278cac9f..d02978dd6979 100644
--- a/plugins/stream-debugger/testData/dsl/java/linkedMapDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/java/linkedMapDeclaration.out
@@ -1 +1 @@
-java.util.LinkedHashMap<java.lang.Integer, java.lang.Boolean> map;
+java.util.Map<java.lang.Integer, java.lang.Boolean> map;
diff --git a/plugins/stream-debugger/testData/dsl/java/linkedMapInitialization.out b/plugins/stream-debugger/testData/dsl/java/linkedMapInitialization.out
index 61c88e5638c0..c851450eb8c2 100644
--- a/plugins/stream-debugger/testData/dsl/java/linkedMapInitialization.out
+++ b/plugins/stream-debugger/testData/dsl/java/linkedMapInitialization.out
@@ -1 +1 @@
-final java.util.LinkedHashMap<java.lang.Integer, java.lang.Boolean> map = new java.util.LinkedHashMap<>();
+final java.util.Map<java.lang.Integer, java.lang.Boolean> map = new java.util.HashMap<>();
diff --git a/plugins/stream-debugger/testData/dsl/java/listOperations.out b/plugins/stream-debugger/testData/dsl/java/listOperations.out
index 0a34388d0fcf..63ca20597aac 100644
--- a/plugins/stream-debugger/testData/dsl/java/listOperations.out
+++ b/plugins/stream-debugger/testData/dsl/java/listOperations.out
@@ -1,4 +1,4 @@
-final java.util.List<java.lang.Long> lst = new java.util.ArrayList<java.lang.Long>();
+final java.util.List<java.lang.Long> lst = new java.util.ArrayList<>();
 lst.add(100);
 lst.get(0).methodWithSideEffect();
 lst.set(1, lst.get(0));
diff --git a/plugins/stream-debugger/testData/dsl/java/mapDeclaration.out b/plugins/stream-debugger/testData/dsl/java/mapDeclaration.out
index 96dd532cd228..ba9a5f2afded 100644
--- a/plugins/stream-debugger/testData/dsl/java/mapDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/java/mapDeclaration.out
@@ -1 +1 @@
-final java.util.HashMap<java.lang.Integer, java.lang.Boolean> map;
+final java.util.Map<java.lang.Integer, java.lang.Boolean> map;
diff --git a/plugins/stream-debugger/testData/dsl/java/mapInitialization.out b/plugins/stream-debugger/testData/dsl/java/mapInitialization.out
index 15604c15dbe4..c428c7cc8c60 100644
--- a/plugins/stream-debugger/testData/dsl/java/mapInitialization.out
+++ b/plugins/stream-debugger/testData/dsl/java/mapInitialization.out
@@ -1 +1 @@
-final java.util.HashMap<java.lang.Integer, java.lang.Integer> map = new java.util.HashMap<>();
+final java.util.Map<java.lang.Integer, java.lang.Integer> map = new java.util.HashMap<>();
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/arrayCreateFromElements.out b/plugins/stream-debugger/testData/dsl/kotlin/arrayCreateFromElements.out
index 37a11dc14493..196b576c32ec 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/arrayCreateFromElements.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/arrayCreateFromElements.out
@@ -1 +1 @@
-var array: kotlin.Array<kotlin.Double> = kotlin.arrayOf<kotlin.Double>(10.0, 20.0)
+var array: kotlin.Array<kotlin.Double?> = kotlin.arrayOf<kotlin.Double>(10.0, 20.0)
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/arrayDeclaration.out b/plugins/stream-debugger/testData/dsl/kotlin/arrayDeclaration.out
index 2f9af4c18500..0b0387e04b3c 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/arrayDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/arrayDeclaration.out
@@ -1 +1 @@
-var a: kotlin.Array<kotlin.Int>
+var a: kotlin.Array<kotlin.Int?>
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/arrayDefaultDeclaration.out b/plugins/stream-debugger/testData/dsl/kotlin/arrayDefaultDeclaration.out
index 87155c3b85bb..0c01b3e6a44a 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/arrayDefaultDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/arrayDefaultDeclaration.out
@@ -1 +1 @@
-var array: kotlin.Array<kotlin.Int> = kotlin.arrayOfNulls<kotlin.Int>(10)
+var array: kotlin.Array<kotlin.Int?> = kotlin.arrayOfNulls(1)
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/arrayElementUsage.out b/plugins/stream-debugger/testData/dsl/kotlin/arrayElementUsage.out
index 6865e4a2daf4..88928c335ebd 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/arrayElementUsage.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/arrayElementUsage.out
@@ -1,2 +1,2 @@
-a[10]
-a[11]
+a[10]!!
+a[11]!!
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/forEach.out b/plugins/stream-debugger/testData/dsl/kotlin/forEach.out
index 3f37db3f487b..52cfc472a2e1 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/forEach.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/forEach.out
@@ -1,4 +1,4 @@
-var objects: kotlin.collections.List<kotlin.Any> = getObjects()
+var objects: kotlin.collections.MutableList<kotlin.Any> = getObjects()
 for (object in objects) {
   object.toString()
 }
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/forLoop.out b/plugins/stream-debugger/testData/dsl/kotlin/forLoop.out
index c0f67a7e8be8..c05bad355dc6 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/forLoop.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/forLoop.out
@@ -1,4 +1,4 @@
-var objects: kotlin.collections.List<kotlin.Any> = getObjects()
+var objects: kotlin.collections.MutableList<kotlin.Any> = getObjects()
 var i: kotlin.Int = 0
 while (i < objects.size()) {
   i.toString()
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/linkedMapDeclaration.out b/plugins/stream-debugger/testData/dsl/kotlin/linkedMapDeclaration.out
index 35cce8e6f521..3904a95e7f59 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/linkedMapDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/linkedMapDeclaration.out
@@ -1 +1 @@
-var map: kotlin.collections.LinkedHashMap<kotlin.Int, kotlin.Boolean>
+var map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Boolean>
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/linkedMapInitialization.out b/plugins/stream-debugger/testData/dsl/kotlin/linkedMapInitialization.out
index aa20bbe43824..5b2e12dfdeed 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/linkedMapInitialization.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/linkedMapInitialization.out
@@ -1 +1 @@
-var map: kotlin.collections.LinkedHashMap<kotlin.Int, kotlin.Boolean> = mutableMapOf()
+var map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Boolean> = kotlin.collections.linkedMapOf()
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/listOperations.out b/plugins/stream-debugger/testData/dsl/kotlin/listOperations.out
index 9bc8220337e7..3b4bfcbe4092 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/listOperations.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/listOperations.out
@@ -1,4 +1,4 @@
-var lst: kotlin.collections.MutableList<kotlin.Long> = mutableListOf<kotlin.Long>()
+var lst: kotlin.collections.MutableList<kotlin.Long> = kotlin.collections.mutableListOf()
 lst.add(100)
 lst.get(0).methodWithSideEffect()
 lst.set(1, lst.get(0))
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/loopWithBreak.out b/plugins/stream-debugger/testData/dsl/kotlin/loopWithBreak.out
index e5efc63345e4..aa992f3c9abe 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/loopWithBreak.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/loopWithBreak.out
@@ -1,4 +1,4 @@
-var objects: kotlin.collections.List<kotlin.Any> = getObjects()
+var objects: kotlin.collections.MutableList<kotlin.Any> = getObjects()
 for (object in objects) {
   break
 }
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/loopWithNestedBreak.out b/plugins/stream-debugger/testData/dsl/kotlin/loopWithNestedBreak.out
index 1e745234699d..01553606835b 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/loopWithNestedBreak.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/loopWithNestedBreak.out
@@ -1,4 +1,4 @@
-var objects: kotlin.collections.List<kotlin.Any> = getObjects()
+var objects: kotlin.collections.MutableList<kotlin.Any> = getObjects()
 for (object in objects) {
   if (object.isEmpty) {
     break
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/mapConvertToArray.out b/plugins/stream-debugger/testData/dsl/kotlin/mapConvertToArray.out
index 7fbf563bb62e..1e4d49b77605 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/mapConvertToArray.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/mapConvertToArray.out
@@ -1,8 +1,8 @@
-var resultArray: kotlin.Array<kotlin.Any>
+var resultArray: kotlin.Array<kotlin.Any?>
 run {
   var size: kotlin.Int = map.size
-  var keys: kotlin.Array<kotlin.Int> = kotlin.arrayOfNulls<kotlin.Int>(size)
-  var values: kotlin.Array<kotlin.Any> = kotlin.arrayOfNulls<kotlin.Any>(size)
+  var keys: kotlin.Array<kotlin.Int?> = kotlin.arrayOfNulls(1)
+  var values: kotlin.Array<kotlin.Any?> = kotlin.arrayOfNulls(1)
   var i: kotlin.Int = 0
   for (key in map.keys) {
     keys[i] = key
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/mapDeclaration.out b/plugins/stream-debugger/testData/dsl/kotlin/mapDeclaration.out
index cdf0c5e6b365..3904a95e7f59 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/mapDeclaration.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/mapDeclaration.out
@@ -1 +1 @@
-var map: kotlin.collections.HashMap<kotlin.Int, kotlin.Boolean>
+var map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Boolean>
diff --git a/plugins/stream-debugger/testData/dsl/kotlin/mapInitialization.out b/plugins/stream-debugger/testData/dsl/kotlin/mapInitialization.out
index 431248c69503..189b602916c3 100644
--- a/plugins/stream-debugger/testData/dsl/kotlin/mapInitialization.out
+++ b/plugins/stream-debugger/testData/dsl/kotlin/mapInitialization.out
@@ -1 +1 @@
-var map: kotlin.collections.HashMap<kotlin.Int, kotlin.Int> = mutableMapOf()
+var map: kotlin.collections.MutableMap<kotlin.Int, kotlin.Int> = kotlin.collections.mutableMapOf()