diff --git a/idea/testData/checker/Constructors.jet b/idea/testData/checker/Constructors.jet
index 7c6e8582a56..6891d8f1f98 100644
--- a/idea/testData/checker/Constructors.jet
+++ b/idea/testData/checker/Constructors.jet
@@ -23,7 +23,7 @@ class WithPC1(a : Int) {
 
   this(s : String) : this(1) {}
 
-  this(b : Char) : <error>this("", 2)</error> {}
+  this(b : Char) : <error>this</error>("", 2) {}
 
   this(b : Byte) : this(""), <error>this(1)</error> {}
 }
diff --git a/idea/testData/checker/ExtensionFunctions.jet b/idea/testData/checker/ExtensionFunctions.jet
index 618b16d44e2..f1ec6d22908 100644
--- a/idea/testData/checker/ExtensionFunctions.jet
+++ b/idea/testData/checker/ExtensionFunctions.jet
@@ -16,7 +16,7 @@ class A
 fun A.plus(a : Any) {
 
   1.foo()
-  true.<error>foo()</error>
+  true.<error>foo</error>()
 
   1
 }
diff --git a/idea/testData/checkerWithErrorTypes/full/Constructors.jet b/idea/testData/checkerWithErrorTypes/full/Constructors.jet
index 370fa759a3e..85a218569ac 100644
--- a/idea/testData/checkerWithErrorTypes/full/Constructors.jet
+++ b/idea/testData/checkerWithErrorTypes/full/Constructors.jet
@@ -22,7 +22,7 @@ class WithPC1(a : Int) {
 
   this(s : String) : this(1) {}
 
-  this(b : Char) : <!NONE_APPLICABLE!>this("", 2)<!> {}
+  this(b : Char) : <!NONE_APPLICABLE!>this<!>("", 2) {}
 
   this(b : Byte) : this(""), <!MANY_CALLS_TO_THIS!>this(1)<!> {}
 }
diff --git a/idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet b/idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet
index 72d955b6e3f..d12496d9e8b 100644
--- a/idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet
+++ b/idea/testData/checkerWithErrorTypes/full/ExtensionFunctions.jet
@@ -16,7 +16,7 @@ class A
 fun A.plus(a : Any) {
 
   1.foo()
-  true.<!NONE_APPLICABLE!>foo()<!>
+  true.<!NONE_APPLICABLE!>foo<!>()
 
   1
 }
@@ -55,12 +55,12 @@ namespace null_safety {
 
             val command = parse("")
 
-            command<!UNSAFE_CALL!>.<!>foo
+            command.foo
 
             command.equals(null)
             command?.equals(null)
             command.equals1(null)
-            command?.equals1(null)
+            command<!UNNECESSARY_SAFE_CALL!>?.<!>equals1(null)
 
             val c = Command()
             c<!UNNECESSARY_SAFE_CALL!>?.<!>equals2(null)