FIR: Adjust test data

Currently, we've got two places where NO_COMPANION_OBJECT is reported
and they perform it kind of differently

compiler/fir/analysis-tests/testData/resolve/expresssions/classifierAccessFromCompanion.fir.txt

@@ -23,7 +23,7 @@ FILE: classifierAccessFromCompanion.kt
                 super<R|kotlin/Any|>()
             }
 
-            public final val f: R|kotlin/Unit| = R|kotlin/Unit|
+            public final val f: R|kotlin/Unit| = Q|Factory.Function|
                 public get(): R|kotlin/Unit|
 
             public final val x: R|Factory.Function.Default| = Q|Factory.Function.Default|

compiler/testData/diagnostics/tests/ResolveToJava.fir.kt

@@ -29,7 +29,7 @@ fun test(l : java.util.List<Int>) {
   checkSubtype<Set<Int>?>(Collections.singleton<Int>(1))
   Collections.singleton<Int>(<!ARGUMENT_TYPE_MISMATCH!>1.0<!>)
 
-  <!NO_COMPANION_OBJECT!>List<!><Int>
+  <!NO_COMPANION_OBJECT!>List<Int><!>
 
 
   val o = "sdf" as Object

compiler/testData/diagnostics/tests/objects/kt5527.fir.kt

@@ -9,7 +9,7 @@ fun foo() {
     val i1: Int = <!INITIALIZER_TYPE_MISMATCH!>Boo<!>
     val i2: Int = <!INITIALIZER_TYPE_MISMATCH!>A.Boo<!>
     useInt(<!ARGUMENT_TYPE_MISMATCH!>Boo<!>)
-    useInt(A.<!ARGUMENT_TYPE_MISMATCH!>Boo<!>)
+    useInt(<!ARGUMENT_TYPE_MISMATCH!>A.Boo<!>)
 }
 fun bar() {
     val i1: Int = <!INITIALIZER_TYPE_MISMATCH!>Unit<!>

compiler/testData/diagnostics/testsWithStdLib/inference/kt1558.fir.kt

@@ -10,7 +10,7 @@ fun <T : Any> T?.sure() : T = this!!
 fun <E> List<*>.toArray(ar: Array<E>): Array<E> = ar
 
 fun testArrays(ci: List<Int?>, cii: List<Int?>?) {
-    val c1: Array<Int?> = cii.sure().toArray(<!ARGUMENT_TYPE_MISMATCH, NO_COMPANION_OBJECT!>Array<!><Int?>)
+    val c1: Array<Int?> = cii.sure().toArray(<!ARGUMENT_TYPE_MISMATCH, NO_COMPANION_OBJECT!>Array<Int?><!>)
 
     val c2: Array<Int?> = ci.toArray(Array<Int?>(<!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>)<!>)