From d8e5b068d5656c7b04ac35488f9e274c28dcdf9f Mon Sep 17 00:00:00 2001
From: "victor.petukhov" <victor.petukhov@jetbrains.com>
Date: Mon, 12 Aug 2019 12:06:17 +0300
Subject: [PATCH] Relinking spec tests

---
 .../boolean-literals/p-1/pos/2.1.kt           |   7 +-
 .../boolean-literals/p-1/pos/2.10.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.11.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.12.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.13.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.14.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.15.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.16.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.17.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.18.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.19.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.2.kt           |   4 +-
 .../boolean-literals/p-1/pos/2.20.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.21.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.22.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.23.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.24.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.25.kt          |   4 +-
 .../boolean-literals/p-1/pos/2.26.kt          |   6 +-
 .../boolean-literals/p-1/pos/2.3.kt           |   6 +-
 .../boolean-literals/p-1/pos/2.4.kt           |   6 +-
 .../boolean-literals/p-1/pos/2.5.kt           |   6 +-
 .../boolean-literals/p-1/pos/2.6.kt           |   6 +-
 .../boolean-literals/p-1/pos/2.7.kt           |   4 +-
 .../boolean-literals/p-1/pos/2.8.kt           |   4 +-
 .../boolean-literals/p-1/pos/2.9.kt           |   6 +-
 .../boolean-literals/testsMap.json            | 164 +++++++
 .../binary-integer-literals/p-1/pos/1.1.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/2.1.kt    |   4 +-
 .../binary-integer-literals/testsMap.json     |  22 +
 .../decimal-integer-literals/p-1/pos/1.1.kt   |   4 +-
 .../decimal-integer-literals/p-1/pos/2.1.kt   |   4 +-
 .../decimal-integer-literals/testsMap.json    |  22 +
 .../p-1/pos/1.1.kt                            |   4 +-
 .../p-1/pos/2.1.kt                            |   4 +-
 .../testsMap.json                             |  22 +
 .../real-literals/p-1/pos/1.1.kt              |   4 +-
 .../real-literals/p-1/pos/3.1.kt              |   4 +-
 .../real-literals/p-2/pos/1.1.kt              |   4 +-
 .../real-literals/p-2/pos/1.2.kt              |   4 +-
 .../real-literals/p-3/pos/1.1.kt              |   4 +-
 .../real-literals/p-3/pos/1.2.kt              |   4 +-
 .../real-literals/p-3/pos/1.3.kt              |   4 +-
 .../real-literals/p-3/pos/1.4.kt              |   4 +-
 .../real-literals/p-3/pos/2.1.kt              |   4 +-
 .../real-literals/p-3/pos/2.2.kt              |   4 +-
 .../real-literals/p-3/pos/2.3.kt              |   4 +-
 .../real-literals/p-4/pos/1.1.kt              |   4 +-
 .../real-literals/p-4/pos/1.2.kt              |   4 +-
 .../real-literals/p-4/pos/1.3.kt              |   4 +-
 .../real-literals/p-4/pos/1.4.kt              |   4 +-
 .../real-literals/p-4/pos/1.5.kt              |   4 +-
 .../real-literals/testsMap.json               | 126 ++++++
 .../p-1/pos/1.1.kt                            |   4 +-
 .../p-1/pos/1.2.kt                            |   4 +-
 .../p-1/pos/1.3.kt                            |   4 +-
 .../testsMap.json                             |  26 ++
 .../annotations/type-annotations/neg/1.kt     |   1 -
 .../annotations/type-annotations/neg/10.kt    |   1 -
 .../annotations/type-annotations/neg/11.kt    |   1 -
 .../annotations/type-annotations/neg/2.kt     |   1 -
 .../annotations/type-annotations/neg/3.kt     |   1 -
 .../annotations/type-annotations/neg/4.kt     |   1 -
 .../annotations/type-annotations/neg/5.kt     |   1 -
 .../annotations/type-annotations/neg/6.kt     |   1 -
 .../annotations/type-annotations/neg/7.kt     |   1 -
 .../annotations/type-annotations/neg/8.kt     |   1 -
 .../annotations/type-annotations/neg/9.kt     |   1 -
 .../notLinked/objects/inheritance/pos/1.kt    |   1 -
 .../notLinked/objects/inheritance/pos/2.kt    |   1 -
 .../boolean-literals/p-1/neg/3.1.kt           |   2 +-
 .../boolean-literals/p-1/neg/3.1.txt          |   8 +-
 .../boolean-literals/p-1/pos/3.1.kt           |   2 +-
 .../boolean-literals/p-1/pos/3.1.txt          |   8 +-
 .../boolean-literals/p-1/pos/3.2.kt           |   2 +-
 .../boolean-literals/p-1/pos/3.2.txt          |   8 +-
 .../boolean-literals/testsMap.json            |  30 ++
 .../binary-integer-literals/p-1/neg/1.1.kt    |   2 +-
 .../binary-integer-literals/p-1/neg/2.1.kt    |   2 +-
 .../binary-integer-literals/p-1/neg/2.2.kt    |   2 +-
 .../binary-integer-literals/p-1/neg/2.3.kt    |   2 +-
 .../binary-integer-literals/testsMap.json     |  34 ++
 .../decimal-integer-literals/p-1/neg/2.1.kt   |  23 +-
 .../decimal-integer-literals/p-1/neg/2.1.txt  |  13 +-
 .../decimal-integer-literals/p-1/neg/2.2.kt   |   2 +-
 .../decimal-integer-literals/p-1/neg/2.3.kt   |  32 ++
 .../decimal-integer-literals/p-1/neg/2.3.txt  |  10 +
 .../decimal-integer-literals/testsMap.json    |  26 ++
 .../p-1/neg/1.1.kt                            |   2 +-
 .../p-1/neg/2.1.kt                            |   2 +-
 .../p-1/neg/2.2.kt                            |   2 +-
 .../p-1/neg/2.3.kt                            |  30 +-
 .../p-1/neg/2.3.txt                           |  18 +-
 .../p-1/neg/2.4.kt                            |  29 ++
 .../p-1/neg/2.4.txt                           |   9 +
 .../testsMap.json                             |  40 ++
 .../long-integer-literals/testsMap.txt        |  13 -
 .../real-literals/p-1/neg/1.1.kt              |   2 +-
 .../real-literals/p-1/neg/3.1.kt              |   2 +-
 .../real-literals/p-1/pos/1.1.kt              |   2 +-
 .../real-literals/p-1/pos/1.2.kt              |   2 +-
 .../real-literals/p-1/pos/3.1.kt              |   2 +-
 .../real-literals/p-1/pos/3.2.kt              |   2 +-
 .../real-literals/p-2/neg/1.1.kt              |   2 +-
 .../real-literals/p-2/neg/1.2.kt              |   2 +-
 .../real-literals/p-2/neg/1.3.kt              |   2 +-
 .../real-literals/p-2/neg/1.4.kt              |   2 +-
 .../real-literals/p-2/pos/1.1.kt              |   2 +-
 .../real-literals/p-2/pos/1.2.kt              |   2 +-
 .../real-literals/p-3/neg/1.1.kt              |   2 +-
 .../real-literals/p-3/neg/1.2.kt              |   2 +-
 .../real-literals/p-3/neg/2.1.kt              |   2 +-
 .../real-literals/p-3/pos/1.1.kt              |   2 +-
 .../real-literals/p-3/pos/1.2.kt              |   2 +-
 .../real-literals/p-3/pos/1.3.kt              |   2 +-
 .../real-literals/p-3/pos/1.4.kt              |   2 +-
 .../real-literals/p-3/pos/1.5.kt              |   2 +-
 .../real-literals/p-3/pos/2.1.kt              |   2 +-
 .../real-literals/p-3/pos/2.2.kt              |   2 +-
 .../real-literals/p-3/pos/2.3.kt              |   2 +-
 .../real-literals/p-4/neg/1.1.kt              |   2 +-
 .../real-literals/p-4/neg/1.2.kt              |   2 +-
 .../real-literals/p-4/neg/2.1.kt              |   2 +-
 .../real-literals/p-4/neg/2.2.kt              |   2 +-
 .../real-literals/p-4/neg/2.3.kt              |   2 +-
 .../real-literals/p-4/pos/1.1.kt              |   2 +-
 .../real-literals/p-4/pos/1.2.kt              |   2 +-
 .../real-literals/p-4/pos/1.3.kt              |   2 +-
 .../real-literals/p-4/pos/1.4.kt              |   2 +-
 .../real-literals/p-4/pos/1.5.kt              |   2 +-
 .../real-literals/p-5/pos/1.1.kt              |   2 +-
 .../real-literals/p-5/pos/1.1.txt             |   8 +-
 .../real-literals/p-5/pos/1.2.kt              |   2 +-
 .../real-literals/p-5/pos/1.2.txt             |   8 +-
 .../real-literals/p-5/pos/1.3.kt              |   2 +-
 .../real-literals/p-5/pos/1.3.txt             |   8 +-
 .../real-literals/p-5/pos/1.4.kt              |   2 +-
 .../real-literals/p-5/pos/1.4.txt             |   8 +-
 .../real-literals/p-5/pos/1.5.kt              |   2 +-
 .../real-literals/p-5/pos/1.5.txt             |   8 +-
 .../real-literals/testsMap.json               | 286 ++++++++++++
 .../real-literals/testsMap.txt                |   2 +-
 .../p-1/neg/1.1.kt                            |   4 +-
 .../p-1/neg/1.1.txt                           |   0
 .../p-1/neg/1.2.kt                            |   4 +-
 .../p-1/neg/1.2.txt                           |   0
 .../p-1/neg/1.3.kt                            |   4 +-
 .../p-1/neg/1.3.txt                           |   0
 .../p-1/neg/2.1.kt                            |   4 +-
 .../p-1/neg/2.2.kt                            |   4 +-
 .../p-1/neg/2.3.kt                            |   4 +-
 .../p-1/neg/2.4.kt                            |   4 +-
 .../p-1/neg/2.5.kt                            |   4 +-
 .../p-1/pos/2.1.kt                            |   4 +-
 .../p-1/pos/2.2.kt                            |   4 +-
 .../p-1/pos/2.3.kt                            |   4 +-
 .../p-1/pos/2.4.kt                            |   4 +-
 .../p-1/pos/2.5.kt                            |   4 +-
 .../testsMap.json                             |  92 ++++
 .../p-2/neg/1.1.kt                            |   2 +-
 .../p-2/neg/1.2.kt                            |   2 +-
 .../p-2/neg/{8.1.kt => 10.1.kt}               |   4 +-
 .../p-2/neg/{8.2.kt => 10.2.kt}               |   4 +-
 .../p-2/neg/{8.3.kt => 10.3.kt}               |   4 +-
 .../p-2/neg/3.1.kt                            |   2 +-
 .../p-2/neg/6.1.kt                            |   2 +-
 .../p-2/neg/7.1.kt                            |  58 ---
 .../p-2/pos/1.1.kt                            |   2 +-
 .../p-2/pos/1.2.kt                            |   2 +-
 .../p-2/pos/1.3.kt                            |   2 +-
 .../p-2/pos/10.1.kt                           |  24 +
 .../p-2/pos/{8.2.kt => 10.2.kt}               |   6 +-
 .../p-2/pos/{8.3.kt => 10.3.kt}               |   4 +-
 .../p-2/pos/3.1.kt                            |   2 +-
 .../p-2/pos/6.1.kt                            |   2 +-
 .../p-2/pos/7.1.kt                            |  24 -
 .../p-2/pos/8.1.kt                            |  20 +-
 .../exhaustive-when-expressions/testsMap.json | 122 +++++
 .../when-expression/{p-2 => p-1}/pos/3.1.kt   |   4 +-
 .../when-expression/{p-2 => p-1}/pos/3.2.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/neg/1.1.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/neg/2.1.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/neg/2.2.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/pos/1.1.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/pos/2.1.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/pos/2.2.kt   |   4 +-
 .../when-expression/{p-3 => p-2}/pos/2.3.kt   |   4 +-
 .../when-expression/p-5/neg/1.1.kt            |  35 +-
 .../when-expression/p-5/pos/1.1.kt            | 318 ++++++++++++-
 .../when-expression/p-6/neg/1.1.kt            |  36 +-
 .../when-expression/{p-7 => p-6}/neg/1.2.kt   |   4 +-
 .../when-expression/p-6/neg/11.1.kt           |  33 ++
 .../when-expression/{p-7 => p-6}/neg/3.1.kt   |   4 +-
 .../when-expression/{p-7 => p-6}/neg/3.2.kt   |   4 +-
 .../{p-7/neg/7.1.kt => p-6/neg/6.1.kt}        |   4 +-
 .../{p-7/neg/5.1.kt => p-6/neg/9.1.kt}        |   4 +-
 .../{p-7/neg/5.2.kt => p-6/neg/9.2.kt}        |   4 +-
 .../when-expression/p-6/pos/1.1.kt            | 333 ++------------
 .../when-expression/{p-7 => p-6}/pos/1.2.kt   |   4 +-
 .../when-expression/{p-7 => p-6}/pos/1.3.kt   |   4 +-
 .../when-expression/{p-7 => p-6}/pos/1.4.kt   |   4 +-
 .../when-expression/p-6/pos/11.1.kt           |  26 ++
 .../when-expression/{p-7 => p-6}/pos/3.1.kt   |   4 +-
 .../when-expression/{p-7 => p-6}/pos/3.2.kt   |   4 +-
 .../{p-7/pos/7.1.kt => p-6/pos/6.1.kt}        |   4 +-
 .../when-expression/p-6/pos/6.1.txt           |   5 +
 .../{p-7/pos/5.1.kt => p-6/pos/9.1.kt}        |   4 +-
 .../{p-7/pos/5.2.kt => p-6/pos/9.2.kt}        |   4 +-
 .../when-expression/p-7/neg/1.1.kt            |  38 --
 .../when-expression/p-7/pos/1.1.kt            |  69 ---
 .../when-expression/p-9/neg/1.1.kt            | 143 ------
 .../when-expression/p-9/neg/1.2.kt            |  93 ----
 .../when-expression/p-9/neg/1.3.kt            |  78 ----
 .../when-expression/p-9/neg/1.4.kt            | 173 -------
 .../when-expression/p-9/pos/1.1.kt            | 115 -----
 .../when-expression/p-9/pos/1.2.kt            |  73 ---
 .../when-expression/p-9/pos/1.3.kt            |  69 ---
 .../when-expression/p-9/pos/1.4.kt            | 139 ------
 .../expressions/when-expression/testsMap.json | 232 ++++++++++
 .../type-system/introduction-1/p-6/neg/2.1.kt |   6 +-
 .../type-system/introduction-1/p-6/neg/2.3.kt |   2 +-
 .../diagnostics/notLinked/dfa/neg/1.kt        |   4 +-
 .../diagnostics/notLinked/dfa/neg/22.kt       |   4 +-
 .../diagnostics/notLinked/dfa/neg/30.kt       |  10 +-
 .../diagnostics/notLinked/dfa/neg/32.kt       |   8 +-
 .../diagnostics/notLinked/dfa/neg/40.kt       |   6 +-
 .../diagnostics/notLinked/dfa/neg/43.kt       |   2 +-
 .../diagnostics/notLinked/dfa/neg/45.kt       |   2 +-
 .../diagnostics/notLinked/dfa/pos/1.kt        |  16 -
 .../diagnostics/notLinked/dfa/pos/11.kt       |  54 +--
 .../diagnostics/notLinked/dfa/pos/12.kt       | 212 ++++-----
 .../diagnostics/notLinked/dfa/pos/13.kt       | 237 +++++-----
 .../diagnostics/notLinked/dfa/pos/14.kt       |   4 +-
 .../diagnostics/notLinked/dfa/pos/15.kt       |  72 ++-
 .../diagnostics/notLinked/dfa/pos/25.kt       |   7 +-
 .../diagnostics/notLinked/dfa/pos/26.kt       |   7 +-
 .../diagnostics/notLinked/dfa/pos/27.kt       |   7 +-
 .../diagnostics/notLinked/dfa/pos/29.kt       |   9 +-
 .../diagnostics/notLinked/dfa/pos/3.kt        |   6 +-
 .../diagnostics/notLinked/dfa/pos/30.kt       |   4 +-
 .../diagnostics/notLinked/dfa/pos/31.kt       |   9 +-
 .../diagnostics/notLinked/dfa/pos/32.kt       |   2 +-
 .../diagnostics/notLinked/dfa/pos/4.kt        |   6 +-
 .../diagnostics/notLinked/dfa/pos/40.kt       |   9 +-
 .../diagnostics/notLinked/dfa/pos/41.kt       |   2 +-
 .../diagnostics/notLinked/dfa/pos/5.kt        |   4 +-
 .../diagnostics/notLinked/dfa/pos/50.kt       |  14 +-
 .../diagnostics/notLinked/dfa/pos/51.kt       |  15 +-
 .../diagnostics/notLinked/dfa/pos/55.kt       |   4 +-
 .../diagnostics/notLinked/dfa/pos/57.kt       |  32 +-
 .../diagnostics/notLinked/dfa/pos/6.kt        |  42 +-
 .../diagnostics/notLinked/dfa/pos/64.kt       |   4 +-
 .../diagnostics/notLinked/dfa/pos/72.kt       |   2 +-
 .../diagnostics/notLinked/dfa/pos/9.kt        | 264 +++++------
 .../boolean-literals/p-1/neg/2.1.kt           |  19 -
 .../boolean-literals/p-1/neg/2.1.txt          |  98 ----
 .../boolean-literals/p-1/neg/2.10.kt          |  27 --
 .../boolean-literals/p-1/neg/2.10.txt         | 119 -----
 .../boolean-literals/p-1/neg/2.11.kt          |  15 -
 .../boolean-literals/p-1/neg/2.11.txt         |  62 ---
 .../boolean-literals/p-1/neg/2.12.kt          |  24 -
 .../boolean-literals/p-1/neg/2.12.txt         | 111 -----
 .../boolean-literals/p-1/neg/2.13.kt          |  17 -
 .../boolean-literals/p-1/neg/2.13.txt         | 134 ------
 .../boolean-literals/p-1/neg/2.14.kt          |  23 -
 .../boolean-literals/p-1/neg/2.14.txt         | 246 ----------
 .../boolean-literals/p-1/neg/2.15.kt          |  22 -
 .../boolean-literals/p-1/neg/2.15.txt         | 179 --------
 .../boolean-literals/p-1/neg/2.16.kt          |  11 -
 .../boolean-literals/p-1/neg/2.16.txt         |  36 --
 .../boolean-literals/p-1/neg/2.17.kt          |  17 -
 .../boolean-literals/p-1/neg/2.17.txt         | 109 -----
 .../boolean-literals/p-1/neg/2.18.kt          |  15 -
 .../boolean-literals/p-1/neg/2.18.txt         |  95 ----
 .../boolean-literals/p-1/neg/2.19.kt          |  19 -
 .../boolean-literals/p-1/neg/2.19.txt         |  65 ---
 .../boolean-literals/p-1/neg/2.2.kt           |  18 -
 .../boolean-literals/p-1/neg/2.2.txt          |  57 ---
 .../boolean-literals/p-1/neg/2.20.kt          |  15 -
 .../boolean-literals/p-1/neg/2.20.txt         |  68 ---
 .../boolean-literals/p-1/neg/2.21.kt          |  15 -
 .../boolean-literals/p-1/neg/2.21.txt         |  80 ----
 .../boolean-literals/p-1/neg/2.22.kt          |  31 --
 .../boolean-literals/p-1/neg/2.22.txt         | 400 -----------------
 .../boolean-literals/p-1/neg/2.23.kt          |  19 -
 .../boolean-literals/p-1/neg/2.23.txt         | 151 -------
 .../boolean-literals/p-1/neg/2.24.kt          |  25 --
 .../boolean-literals/p-1/neg/2.24.txt         | 158 -------
 .../boolean-literals/p-1/neg/2.25.kt          |  21 -
 .../boolean-literals/p-1/neg/2.25.txt         | 142 ------
 .../boolean-literals/p-1/neg/2.26.kt          |  17 -
 .../boolean-literals/p-1/neg/2.26.txt         |  80 ----
 .../boolean-literals/p-1/neg/2.3.kt           |  26 --
 .../boolean-literals/p-1/neg/2.3.txt          | 322 --------------
 .../boolean-literals/p-1/neg/2.4.kt           |  11 -
 .../boolean-literals/p-1/neg/2.4.txt          |  12 -
 .../boolean-literals/p-1/neg/2.5.kt           |  11 -
 .../boolean-literals/p-1/neg/2.5.txt          |  16 -
 .../boolean-literals/p-1/neg/2.6.kt           |  11 -
 .../boolean-literals/p-1/neg/2.6.txt          |   8 -
 .../boolean-literals/p-1/neg/2.7.kt           |  14 -
 .../boolean-literals/p-1/neg/2.7.txt          |  62 ---
 .../boolean-literals/p-1/neg/2.8.kt           |  17 -
 .../boolean-literals/p-1/neg/2.8.txt          |  94 ----
 .../boolean-literals/p-1/neg/2.9.kt           |  32 --
 .../boolean-literals/p-1/neg/2.9.txt          | 311 -------------
 .../boolean-literals/p-1/pos/2.1.kt           |  19 -
 .../boolean-literals/p-1/pos/2.1.txt          |  99 ----
 .../boolean-literals/p-1/pos/2.10.kt          |  27 --
 .../boolean-literals/p-1/pos/2.10.txt         | 116 -----
 .../boolean-literals/p-1/pos/2.11.kt          |  15 -
 .../boolean-literals/p-1/pos/2.11.txt         |  59 ---
 .../boolean-literals/p-1/pos/2.12.kt          |  24 -
 .../boolean-literals/p-1/pos/2.12.txt         | 108 -----
 .../boolean-literals/p-1/pos/2.13.kt          |  17 -
 .../boolean-literals/p-1/pos/2.13.txt         | 121 -----
 .../boolean-literals/p-1/pos/2.14.kt          |  23 -
 .../boolean-literals/p-1/pos/2.14.txt         | 241 ----------
 .../boolean-literals/p-1/pos/2.15.kt          |  22 -
 .../boolean-literals/p-1/pos/2.15.txt         | 172 -------
 .../boolean-literals/p-1/pos/2.16.kt          |  11 -
 .../boolean-literals/p-1/pos/2.16.txt         |  34 --
 .../boolean-literals/p-1/pos/2.17.kt          |  17 -
 .../boolean-literals/p-1/pos/2.17.txt         | 111 -----
 .../boolean-literals/p-1/pos/2.18.kt          |  15 -
 .../boolean-literals/p-1/pos/2.18.txt         |  95 ----
 .../boolean-literals/p-1/pos/2.19.kt          |  19 -
 .../boolean-literals/p-1/pos/2.19.txt         |  66 ---
 .../boolean-literals/p-1/pos/2.2.kt           |  18 -
 .../boolean-literals/p-1/pos/2.2.txt          |  53 ---
 .../boolean-literals/p-1/pos/2.20.kt          |  15 -
 .../boolean-literals/p-1/pos/2.20.txt         |  83 ----
 .../boolean-literals/p-1/pos/2.21.kt          |  15 -
 .../boolean-literals/p-1/pos/2.21.txt         |  78 ----
 .../boolean-literals/p-1/pos/2.22.kt          |  31 --
 .../boolean-literals/p-1/pos/2.22.txt         | 421 ------------------
 .../boolean-literals/p-1/pos/2.23.kt          |  19 -
 .../boolean-literals/p-1/pos/2.23.txt         | 149 -------
 .../boolean-literals/p-1/pos/2.24.kt          |  25 --
 .../boolean-literals/p-1/pos/2.24.txt         | 166 -------
 .../boolean-literals/p-1/pos/2.25.kt          |  21 -
 .../boolean-literals/p-1/pos/2.25.txt         | 137 ------
 .../boolean-literals/p-1/pos/2.26.kt          |  17 -
 .../boolean-literals/p-1/pos/2.26.txt         |  62 ---
 .../boolean-literals/p-1/pos/2.3.kt           |  26 --
 .../boolean-literals/p-1/pos/2.3.txt          | 319 -------------
 .../boolean-literals/p-1/pos/2.4.kt           |  11 -
 .../boolean-literals/p-1/pos/2.4.txt          |  16 -
 .../boolean-literals/p-1/pos/2.5.kt           |  11 -
 .../boolean-literals/p-1/pos/2.5.txt          |  16 -
 .../boolean-literals/p-1/pos/2.6.kt           |  11 -
 .../boolean-literals/p-1/pos/2.6.txt          |   8 -
 .../boolean-literals/p-1/pos/2.7.kt           |  14 -
 .../boolean-literals/p-1/pos/2.7.txt          |  71 ---
 .../boolean-literals/p-1/pos/2.8.kt           |  17 -
 .../boolean-literals/p-1/pos/2.8.txt          |  94 ----
 .../boolean-literals/p-1/pos/2.9.kt           |  32 --
 .../boolean-literals/p-1/pos/2.9.txt          | 342 --------------
 .../decimal-integer-literals/p-2/neg/1.1.kt   |  14 -
 .../decimal-integer-literals/p-2/neg/1.2.kt   |  14 -
 .../binary-integer-literals/p-1/neg/1.1.kt    |   4 +-
 .../binary-integer-literals/p-1/neg/1.1.txt   |   0
 .../binary-integer-literals/p-1/neg/1.2.kt    |   4 +-
 .../binary-integer-literals/p-1/neg/1.2.txt   |   0
 .../binary-integer-literals/p-1/neg/2.1.kt    |   4 +-
 .../binary-integer-literals/p-1/neg/2.1.txt   |   0
 .../binary-integer-literals/p-1/pos/1.1.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/1.1.txt   |   0
 .../binary-integer-literals/p-1/pos/1.2.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/1.2.txt   |   0
 .../binary-integer-literals/p-1/pos/1.3.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/1.3.txt   |   0
 .../binary-integer-literals/p-1/pos/2.1.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/2.1.txt   |   0
 .../binary-integer-literals/p-1/pos/2.2.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/2.2.txt   |   0
 .../binary-integer-literals/p-1/pos/2.3.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/2.3.txt   |   0
 .../binary-integer-literals/p-1/pos/2.4.kt    |   4 +-
 .../binary-integer-literals/p-1/pos/2.4.txt   |   0
 .../binary-integer-literals/testsMap.json     |  76 ++++
 .../decimal-integer-literals/p-1/neg/1.1.kt   |   4 +-
 .../decimal-integer-literals/p-1/neg/1.1.txt  |   0
 .../decimal-integer-literals/p-1/pos/1.1.kt   |   4 +-
 .../decimal-integer-literals/p-1/pos/1.1.txt  |   0
 .../decimal-integer-literals/p-1/pos/2.1.kt   |   4 +-
 .../decimal-integer-literals/p-1/pos/2.1.txt  |   0
 .../decimal-integer-literals/p-1/pos/2.2.kt   |   4 +-
 .../decimal-integer-literals/p-1/pos/2.2.txt  |   0
 .../decimal-integer-literals/p-1/pos/2.3.kt   |   4 +-
 .../decimal-integer-literals/p-1/pos/2.3.txt  |   0
 .../decimal-integer-literals/p-2/neg/1.1.txt  |   0
 .../decimal-integer-literals/p-2/neg/1.2.txt  |   0
 .../decimal-integer-literals/testsMap.json    |  44 ++
 .../p-1/neg/1.1.kt                            |   4 +-
 .../p-1/neg/1.1.txt                           |   0
 .../p-1/neg/1.2.kt                            |   4 +-
 .../p-1/neg/1.2.txt                           |   0
 .../p-1/neg/2.1.kt                            |   4 +-
 .../p-1/neg/2.1.txt                           |   0
 .../p-1/pos/1.1.kt                            |   4 +-
 .../p-1/pos/1.1.txt                           |   0
 .../p-1/pos/1.2.kt                            |   4 +-
 .../p-1/pos/1.2.txt                           |   0
 .../p-1/pos/2.1.kt                            |   4 +-
 .../p-1/pos/2.1.txt                           |   0
 .../p-1/pos/2.2.kt                            |   4 +-
 .../p-1/pos/2.2.txt                           |   0
 .../p-1/pos/2.3.kt                            |   4 +-
 .../p-1/pos/2.3.txt                           |   0
 .../p-1/pos/2.4.kt                            |   4 +-
 .../p-1/pos/2.4.txt                           |   0
 .../testsMap.json                             |  70 +++
 .../real-literals/p-1/neg/1.1.kt              |   4 +-
 .../real-literals/p-1/neg/1.1.txt             |   0
 .../real-literals/p-1/neg/1.2.kt              |   4 +-
 .../real-literals/p-1/neg/1.2.txt             |   0
 .../real-literals/p-1/neg/1.3.kt              |   4 +-
 .../real-literals/p-1/neg/1.3.txt             |   0
 .../real-literals/p-1/neg/2.1.kt              |   4 +-
 .../real-literals/p-1/neg/2.1.txt             |   0
 .../real-literals/p-1/neg/2.2.kt              |   4 +-
 .../real-literals/p-1/neg/2.2.txt             |   0
 .../real-literals/p-1/neg/2.3.kt              |   4 +-
 .../real-literals/p-1/neg/2.3.txt             |   0
 .../real-literals/p-1/neg/3.1.kt              |   4 +-
 .../real-literals/p-1/neg/3.1.txt             |   0
 .../real-literals/p-1/neg/3.2.kt              |   4 +-
 .../real-literals/p-1/neg/3.2.txt             |   0
 .../real-literals/p-1/neg/3.3.kt              |   4 +-
 .../real-literals/p-1/neg/3.3.txt             |   0
 .../real-literals/p-1/pos/1.1.kt              |   4 +-
 .../real-literals/p-1/pos/1.1.txt             |   0
 .../real-literals/p-1/pos/1.2.kt              |   4 +-
 .../real-literals/p-1/pos/1.2.txt             |   0
 .../real-literals/p-1/pos/3.1.kt              |   4 +-
 .../real-literals/p-1/pos/3.1.txt             |   0
 .../real-literals/p-1/pos/3.2.kt              |   4 +-
 .../real-literals/p-1/pos/3.2.txt             |   0
 .../real-literals/p-2/neg/1.1.kt              |   4 +-
 .../real-literals/p-2/neg/1.1.txt             |   0
 .../real-literals/p-2/neg/1.2.kt              |   4 +-
 .../real-literals/p-2/neg/1.2.txt             |   0
 .../real-literals/p-2/neg/1.3.kt              |   4 +-
 .../real-literals/p-2/neg/1.3.txt             |   0
 .../real-literals/p-2/neg/1.4.kt              |   4 +-
 .../real-literals/p-2/neg/1.4.txt             |   0
 .../real-literals/p-2/pos/1.1.kt              |   4 +-
 .../real-literals/p-2/pos/1.1.txt             |   0
 .../real-literals/p-2/pos/1.2.kt              |   4 +-
 .../real-literals/p-2/pos/1.2.txt             |   0
 .../real-literals/p-2/pos/1.3.kt              |   4 +-
 .../real-literals/p-2/pos/1.3.txt             |   0
 .../real-literals/p-2/pos/1.4.kt              |   4 +-
 .../real-literals/p-2/pos/1.4.txt             |   0
 .../real-literals/p-2/pos/1.5.kt              |   4 +-
 .../real-literals/p-2/pos/1.5.txt             |   0
 .../real-literals/p-2/pos/1.6.kt              |   4 +-
 .../real-literals/p-2/pos/1.6.txt             |   0
 .../real-literals/p-3/neg/1.1.kt              |   4 +-
 .../real-literals/p-3/neg/1.1.txt             |   0
 .../real-literals/p-3/neg/1.2.kt              |   4 +-
 .../real-literals/p-3/neg/1.2.txt             |   0
 .../real-literals/p-3/neg/1.3.kt              |   4 +-
 .../real-literals/p-3/neg/1.3.txt             |   0
 .../real-literals/p-3/neg/1.4.kt              |   4 +-
 .../real-literals/p-3/neg/1.4.txt             |   0
 .../real-literals/p-3/neg/1.5.kt              |   4 +-
 .../real-literals/p-3/neg/1.5.txt             |   0
 .../real-literals/p-3/neg/2.1.kt              |   4 +-
 .../real-literals/p-3/neg/2.1.txt             |   0
 .../real-literals/p-3/neg/3.1.kt              |   4 +-
 .../real-literals/p-3/neg/3.1.txt             |   0
 .../real-literals/p-3/pos/1.1.kt              |   4 +-
 .../real-literals/p-3/pos/1.1.txt             |   0
 .../real-literals/p-3/pos/1.2.kt              |   4 +-
 .../real-literals/p-3/pos/1.2.txt             |   0
 .../real-literals/p-3/pos/1.3.kt              |   4 +-
 .../real-literals/p-3/pos/1.3.txt             |   0
 .../real-literals/p-3/pos/1.4.kt              |   4 +-
 .../real-literals/p-3/pos/1.4.txt             |   0
 .../real-literals/p-3/pos/1.5.kt              |   4 +-
 .../real-literals/p-3/pos/1.5.txt             |   0
 .../real-literals/p-3/pos/1.6.kt              |   4 +-
 .../real-literals/p-3/pos/1.6.txt             |   0
 .../real-literals/p-3/pos/2.1.kt              |   4 +-
 .../real-literals/p-3/pos/2.1.txt             |   0
 .../real-literals/p-3/pos/2.2.kt              |   4 +-
 .../real-literals/p-3/pos/2.2.txt             |   0
 .../real-literals/p-3/pos/2.3.kt              |   4 +-
 .../real-literals/p-3/pos/2.3.txt             |   0
 .../real-literals/p-3/pos/2.4.kt              |   4 +-
 .../real-literals/p-3/pos/2.4.txt             |   0
 .../real-literals/p-4/neg/1.1.kt              |   4 +-
 .../real-literals/p-4/neg/1.1.txt             |   0
 .../real-literals/p-4/neg/1.2.kt              |   4 +-
 .../real-literals/p-4/neg/1.2.txt             |   0
 .../real-literals/p-4/neg/1.3.kt              |   4 +-
 .../real-literals/p-4/neg/1.3.txt             |   0
 .../real-literals/p-4/neg/1.4.kt              |   4 +-
 .../real-literals/p-4/neg/1.4.txt             |   0
 .../real-literals/p-4/pos/1.1.kt              |   4 +-
 .../real-literals/p-4/pos/1.1.txt             |   0
 .../real-literals/p-4/pos/1.2.kt              |   4 +-
 .../real-literals/p-4/pos/1.2.txt             |   0
 .../real-literals/p-4/pos/1.3.kt              |   4 +-
 .../real-literals/p-4/pos/1.3.txt             |   0
 .../real-literals/p-4/pos/1.4.kt              |   4 +-
 .../real-literals/p-4/pos/1.4.txt             |   0
 .../real-literals/p-4/pos/1.5.kt              |   4 +-
 .../real-literals/p-4/pos/1.5.txt             |   0
 .../real-literals/p-4/pos/1.6.kt              |   4 +-
 .../real-literals/p-4/pos/1.6.txt             |   0
 .../real-literals/p-4/pos/1.7.kt              |   4 +-
 .../real-literals/p-4/pos/1.7.txt             |   0
 .../real-literals/p-4/pos/2.1.kt              |   4 +-
 .../real-literals/p-4/pos/2.1.txt             |   0
 .../real-literals/p-4/pos/2.2.kt              |   4 +-
 .../real-literals/p-4/pos/2.2.txt             |   0
 .../real-literals/p-4/pos/2.3.kt              |   4 +-
 .../real-literals/p-4/pos/2.3.txt             |   0
 .../real-literals/p-6/neg/1.1.kt              |   4 +-
 .../real-literals/p-6/neg/1.1.txt             |   0
 .../real-literals/testsMap.json               | 392 ++++++++++++++++
 .../p-1/neg/1.1.kt                            |   4 +-
 .../p-1/neg/1.1.txt                           |   0
 .../p-1/neg/1.2.kt                            |   4 +-
 .../p-1/neg/1.2.txt                           |   0
 .../p-1/neg/1.3.kt                            |   4 +-
 .../p-1/neg/1.3.txt                           |   0
 .../p-1/neg/1.4.kt                            |   4 +-
 .../p-1/neg/1.4.txt                           |   0
 .../p-1/pos/1.1.kt                            |   4 +-
 .../p-1/pos/1.1.txt                           |   0
 .../p-1/pos/1.10.kt                           |   4 +-
 .../p-1/pos/1.10.txt                          |   0
 .../p-1/pos/1.2.kt                            |   4 +-
 .../p-1/pos/1.2.txt                           |   0
 .../p-1/pos/1.3.kt                            |   4 +-
 .../p-1/pos/1.3.txt                           |   0
 .../p-1/pos/1.4.kt                            |   4 +-
 .../p-1/pos/1.4.txt                           |   0
 .../p-1/pos/1.5.kt                            |   4 +-
 .../p-1/pos/1.5.txt                           |   0
 .../p-1/pos/1.6.kt                            |   4 +-
 .../p-1/pos/1.6.txt                           |   0
 .../p-1/pos/1.7.kt                            |   4 +-
 .../p-1/pos/1.7.txt                           |   0
 .../p-1/pos/1.8.kt                            |   4 +-
 .../p-1/pos/1.8.txt                           |   0
 .../p-1/pos/1.9.kt                            |   4 +-
 .../p-1/pos/1.9.txt                           |   0
 .../testsMap.json                             |  96 ++++
 .../when-expression/p-1}/neg/3.1.kt           |   4 +-
 .../when-expression/p-1}/neg/3.1.txt          |   0
 .../when-expression/p-1}/neg/3.2.kt           |   4 +-
 .../when-expression/p-1}/neg/3.2.txt          |   0
 .../when-expression/p-1}/pos/3.1.kt           |   4 +-
 .../when-expression/p-1}/pos/3.1.txt          |   0
 .../when-expression/p-1}/pos/3.2.kt           |   4 +-
 .../when-expression/p-1}/pos/3.2.txt          |   0
 .../when-expression/p-2}/neg/1.1.kt           |   4 +-
 .../when-expression/p-2}/neg/1.1.txt          |   0
 .../when-expression/p-2}/neg/1.2.kt           |   4 +-
 .../when-expression/p-2}/neg/1.2.txt          |   0
 .../when-expression/p-2}/neg/2.1.kt           |   4 +-
 .../when-expression/p-2}/neg/2.1.txt          |   0
 .../when-expression/p-2}/neg/2.2.kt           |   4 +-
 .../when-expression/p-2}/neg/2.2.txt          |   0
 .../when-expression/p-5}/neg/1.1.kt           |   4 +-
 .../when-expression/p-5}/neg/1.1.txt          |   0
 .../when-expression/p-5}/neg/1.2.kt           |   4 +-
 .../when-expression/p-5}/neg/1.2.txt          |   0
 .../when-expression/p-5}/neg/1.3.kt           |   4 +-
 .../when-expression/p-5}/neg/1.3.txt          |   0
 .../when-expression/p-6}/neg/1.1.kt           |   4 +-
 .../when-expression/p-6}/neg/1.1.txt          |   0
 .../p-6}/neg/1.2.exceptions.compiler.txt      |   0
 .../when-expression/p-6}/neg/1.2.kt           |   4 +-
 .../when-expression/p-6}/neg/1.2.txt          |   0
 .../when-expression/p-6/neg/11.1.kt}          |   4 +-
 .../when-expression/p-6/neg/11.1.txt}         |   2 +-
 .../when-expression/p-6}/neg/3.1.kt           |   4 +-
 .../when-expression/p-6}/neg/3.1.txt          |   0
 .../when-expression/p-6/neg/8.1.kt}           |   4 +-
 .../when-expression/p-6/neg/8.1.txt}          |   2 +-
 .../expressions/when-expression/testsMap.json | 134 ++++++
 .../DiagnosticsTestSpecGenerated.java         |  33 +-
 .../BlackBoxCodegenTestSpecGenerated.java     |  43 +-
 .../parsing/ParsingTestSpecGenerated.java     |   4 +-
 590 files changed, 3720 insertions(+), 10085 deletions(-)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.1.kt (87%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.10.kt (82%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.11.kt (89%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.12.kt (87%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.13.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.14.kt (91%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.15.kt (88%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.16.kt (85%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.17.kt (82%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.18.kt (83%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.19.kt (87%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.2.kt (84%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.20.kt (82%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.21.kt (84%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.22.kt (90%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.23.kt (87%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.24.kt (88%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.25.kt (86%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.26.kt (88%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.3.kt (93%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.4.kt (83%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.5.kt (76%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.6.kt (74%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.7.kt (82%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.8.kt (85%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/boolean-literals/p-1/pos/2.9.kt (91%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt (92%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt (87%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt (90%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt (92%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/1.1.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/3.1.kt (97%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.1.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.2.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.1.kt (95%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.2.kt (95%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.3.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.4.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.1.kt (97%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.2.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.3.kt (96%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.1.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.2.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.3.kt (98%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.4.kt (97%)
 rename compiler/tests-spec/testData/codegen/box/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.5.kt (98%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/testsMap.json
 rename compiler/tests-spec/testData/codegen/box/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.1.kt (90%)
 rename compiler/tests-spec/testData/codegen/box/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.2.kt (90%)
 rename compiler/tests-spec/testData/codegen/box/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.3.kt (92%)
 create mode 100644 compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.kt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.kt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.txt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/testsMap.txt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.1.kt (85%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.2.kt (78%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.3.kt (75%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/2.1.kt (82%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/2.2.kt (88%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/2.3.kt (97%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/2.4.kt (91%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/neg/2.5.kt (93%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/pos/2.1.kt (87%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/pos/2.2.kt (93%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/pos/2.3.kt (93%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/pos/2.4.kt (95%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/{integer-literals/long-integer-literals => the-types-for-integer-literals}/p-1/pos/2.5.kt (88%)
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/{8.1.kt => 10.1.kt} (91%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/{8.2.kt => 10.2.kt} (97%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/{8.3.kt => 10.3.kt} (95%)
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/7.1.kt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.1.kt
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/{8.2.kt => 10.2.kt} (85%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/{8.3.kt => 10.3.kt} (97%)
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/7.1.kt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-2 => p-1}/pos/3.1.kt (71%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-2 => p-1}/pos/3.2.kt (66%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/neg/1.1.kt (86%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/neg/2.1.kt (87%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/neg/2.2.kt (90%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/pos/1.1.kt (98%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/pos/2.1.kt (96%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/pos/2.2.kt (77%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-3 => p-2}/pos/2.3.kt (97%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/neg/1.2.kt (82%)
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/11.1.kt
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/neg/3.1.kt (84%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/neg/3.2.kt (92%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/neg/7.1.kt => p-6/neg/6.1.kt} (88%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/neg/5.1.kt => p-6/neg/9.1.kt} (89%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/neg/5.2.kt => p-6/neg/9.2.kt} (88%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/pos/1.2.kt (93%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/pos/1.3.kt (95%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/pos/1.4.kt (94%)
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/11.1.kt
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/pos/3.1.kt (88%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7 => p-6}/pos/3.2.kt (87%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/pos/7.1.kt => p-6/pos/6.1.kt} (85%)
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.txt
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/pos/5.1.kt => p-6/pos/9.1.kt} (98%)
 rename compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/{p-7/pos/5.2.kt => p-6/pos/9.2.kt} (98%)
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.1.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.1.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.1.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.2.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.3.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.4.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.1.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.2.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.3.kt
 delete mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.4.kt
 create mode 100644 compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.txt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
 delete mode 100644 compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt (82%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt (83%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt (76%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt (62%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt (55%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt (64%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt (69%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt (76%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.txt (100%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt (85%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt (78%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt (74%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt (78%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.txt (100%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt (75%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt (90%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt (55%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt (64%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt (69%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt (75%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.txt (100%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.1.kt (95%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.2.kt (83%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.3.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.1.kt (95%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.2.kt (95%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.3.kt (94%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.1.kt (94%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.2.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.3.kt (84%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/neg/3.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/1.1.kt (89%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/1.2.kt (99%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/3.1.kt (90%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/3.2.kt (98%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-1/pos/3.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.1.kt (88%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.2.kt (88%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.3.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.4.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/neg/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.1.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.2.kt (77%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.3.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.4.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.5.kt (79%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.5.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.6.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-2/pos/1.6.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.1.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.2.kt (74%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.3.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.4.kt (80%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.5.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/1.5.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/2.1.kt (83%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/3.1.kt (94%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/neg/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.1.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.2.kt (95%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.3.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.4.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.5.kt (96%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.5.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.6.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/1.6.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.1.kt (85%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.2.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.3.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.4.kt (76%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-3/pos/2.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.1.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.2.kt (94%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.3.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.4.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/neg/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.1.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.2.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.3.kt (94%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.4.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.5.kt (95%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.5.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.6.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.6.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.7.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/1.7.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.1.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.2.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.3.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-4/pos/2.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-6/neg/1.1.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{ => expressions}/constant-literals/real-literals/p-6/neg/1.1.txt (100%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/testsMap.json
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.1.kt (68%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.2.kt (77%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.3.kt (67%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.4.kt (60%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/neg/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.1.kt (86%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.10.kt (63%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.10.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.2.kt (86%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.3.kt (92%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.4.kt (56%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.4.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.5.kt (88%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.5.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.6.kt (93%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.6.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.7.kt (55%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.7.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.8.kt (91%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.8.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.9.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{constant-literals/integer-literals/long-integer-literals => expressions/constant-literals/the-types-for-integer-literals}/p-1/pos/1.9.txt (100%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/neg/3.1.kt (60%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/neg/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/neg/3.2.kt (65%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/neg/3.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/pos/3.1.kt (60%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/pos/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/pos/3.2.kt (59%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-2 => expressions/when-expression/p-1}/pos/3.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/1.1.kt (67%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/1.2.kt (67%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/2.1.kt (81%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/2.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/2.2.kt (90%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-3 => expressions/when-expression/p-2}/neg/2.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.1.kt (66%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.2.kt (67%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.3.kt (83%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-6 => expressions/when-expression/p-5}/neg/1.3.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/1.1.kt (76%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/1.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/1.2.exceptions.compiler.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/1.2.kt (87%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/1.2.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7/neg/7.1.kt => expressions/when-expression/p-6/neg/11.1.kt} (80%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7/neg/7.1.txt => expressions/when-expression/p-6/neg/11.1.txt} (99%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/3.1.kt (77%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7 => expressions/when-expression/p-6}/neg/3.1.txt (100%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7/neg/5.1.kt => expressions/when-expression/p-6/neg/8.1.kt} (77%)
 rename compiler/tests-spec/testData/psi/linked/{when-expression/p-7/neg/5.1.txt => expressions/when-expression/p-6/neg/8.1.txt} (99%)
 create mode 100644 compiler/tests-spec/testData/psi/linked/expressions/when-expression/testsMap.json

diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.1.kt
similarity index 87%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.1.kt
index 921e093cd25..94beb63b87a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.1.kt
@@ -1,13 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * UNEXPECTED BEHAVIOUR
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 open class `true` {
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.10.kt
similarity index 82%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.10.kt
index 6602fa1cccc..3a0844d39ff 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.10.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 10
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the companionObject.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.11.kt
similarity index 89%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.11.kt
index e8f190dc42c..2e7662dfc84 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.11.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 11
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the function.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 fun `true`(): Boolean {
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.12.kt
similarity index 87%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.12.kt
index b7c5af6e887..84cb3f705a7 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.12.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 12
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the setter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 class A {
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.13.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.13.kt
index d5471c5098b..4bdbc5627df 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.13.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 13
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the simpleUserType.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.14.kt
similarity index 91%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.14.kt
index 02422572191..9a62b69e374 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.14.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 14
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeParameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.15.kt
similarity index 88%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.15.kt
index f9d396cb4fd..9c1b852f4de 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.15.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 15
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the parameter.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 fun f1(`true`: Boolean) = !!!`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.16.kt
similarity index 85%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.16.kt
index 9f727d6c91c..74940af1393 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.16.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 16
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 @file:[org.jetbrains.`true`.`false`() `true`]
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.17.kt
similarity index 82%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.17.kt
index 6e953f96714..b86c80a78e6 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.17.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 17
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the object.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 open class A {
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.18.kt
similarity index 83%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.18.kt
index cf48bf1da98..4c96f41b27a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.18.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 18
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeAlias.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 typealias `true` = Boolean
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.19.kt
similarity index 87%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.19.kt
index 0e7da92772c..7c42bad91cb 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.19.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 19
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the import.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.2.kt
similarity index 84%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.2.kt
index 274c6ec45a4..d28848e51cd 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.20.kt
similarity index 82%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.20.kt
index ad98f7b5493..f74e58a385a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.20.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 20
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the infixFunctionCall.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.21.kt
similarity index 84%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.21.kt
index 58b75b6a1a2..c88db7e867b 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.21.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 21
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the catchBlock.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.22.kt
similarity index 90%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.22.kt
index bcff7444f46..d427e09b144 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.22.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 22
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelDefinition.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.23.kt
similarity index 87%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.23.kt
index df08a2ee01e..4f7fb5b6477 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.23.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 23
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the atomicExpression.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.24.kt
similarity index 88%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.24.kt
index 1de1161b16b..491208d0c3b 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.24.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 24
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the variableDeclarationEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.25.kt
similarity index 86%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.25.kt
index 9dca2e3de62..464c43e627b 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.25.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 25
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the valueArgument.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.26.kt
similarity index 88%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.26.kt
index 80d0cc1b639..4bc8053ecb4 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.26.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 26
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the callableReference.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 val Boolean.`true`: Boolean
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.3.kt
similarity index 93%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.3.kt
index 9921a62cf3c..d709b39f868 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.3.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeConstraint.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 class A <`true`, `false`>
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.4.kt
similarity index 83%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.4.kt
index 2d39aa24e0c..8001c3e32bb 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.4.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 @file:`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.5.kt
similarity index 76%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.5.kt
index 83a01d81ba2..c86cd4292e1 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.5.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageComplex.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.6.kt
similarity index 74%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.6.kt
index eb4895fd3e9..c13c0d5e4aa 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.6.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 6
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageSimple.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package `true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.7.kt
similarity index 82%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.7.kt
index 678cf62498e..f3a79478438 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.7.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 7
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the enumEntry.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.8.kt
similarity index 85%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.8.kt
index 8b59d027ffa..7177329fb34 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.8.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 8
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the stringTemplateElement.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.9.kt
similarity index 91%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.9.kt
index 3744f2328aa..4ae767bf4dc 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/p-1/pos/2.9.kt
@@ -1,12 +1,12 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 2
  * NUMBER: 9
  * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.
  * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- * HELPERS: reflect
+ * HELPERS: REFLECT
  */
 
 package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json
new file mode 100644
index 00000000000..83bf33dd0c2
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/boolean-literals/testsMap.json
@@ -0,0 +1,164 @@
+{
+  "1": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the companionObject.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the variableDeclarationEntry.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the class.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the infixFunctionCall.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the typeParameter.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the packageComplex.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the catchBlock.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the parameter.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the function.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the valueArgument.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the typeAlias.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the stringTemplateElement.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the import.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the labelDefinition.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the enumEntry.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the setter.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the callableReference.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the typeConstraint.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the simpleUserType.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the labelReference.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the atomicExpression.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the object.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The use of Boolean literals as the identifier (with backtick) in the packageSimple.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
index 08bb3ac8b3f..0a133d8c3e9 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with binary digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
similarity index 92%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
index 8d9d7d58b2d..4f8a97f6fc7 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with binary digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
new file mode 100644
index 00000000000..69d0c1fa12c
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
@@ -0,0 +1,22 @@
+{
+  "1": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with binary digit symbols separated by underscores.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with binary digit symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
similarity index 87%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
index 90069a40023..8f368063813 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
similarity index 90%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
index 9702184b707..da877194f8d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..5d5bf0b91e1
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
@@ -0,0 +1,22 @@
+{
+  "1": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with decimal digit symbols separated by underscores.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with decimal digit symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
index 3693303f94c..15f84cadb7a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with hexadecimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
similarity index 92%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
index f48595896c6..4ff8d43fd72 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Sequences with hexadecimal digit symbols separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..e9fc81f151b
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
@@ -0,0 +1,22 @@
+{
+  "1": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with hexadecimal digit symbols separated by underscores.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with hexadecimal digit symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
index 26528f48a10..3293488bb77 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
similarity index 97%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
index ae967ac35f2..5c71f3c99c2 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
index 90f102851a5..6adc1c9acdf 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
index aab0aca9d91..11f6a8b32ed 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
similarity index 95%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
index 9a3e44c6024..e562132990e 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
similarity index 95%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
index 64686e61aff..f37b7f23b64 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
index 2cf61d86861..ff7ab3283b8 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
index 0b0cd0fce8e..e5b888dc124 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
similarity index 97%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
index 6738890e5b1..0591b29885d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
index d60e3c42d3d..686936834ee 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
similarity index 96%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
index f87d170c76d..c7978f4489d 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
index 9924095db7f..97febdaf154 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
index e84edcf6f30..62ccd006d79 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
index 6644ca6bde7..beb52ac53a6 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
similarity index 97%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
index 3963d3cc971..c4a19ffeaef 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
similarity index 98%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
index f8294d8d6f5..55ccbfe7337 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/testsMap.json
new file mode 100644
index 00000000000..7de93ad05f3
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/real-literals/testsMap.json
@@ -0,0 +1,126 @@
+{
+  "1": {
+    "pos": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "4": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a fraction part and an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
similarity index 90%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
index 8d65733a0f9..820d4d07d3e 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Decimal integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
similarity index 90%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
index 66d13727fdd..23b77c02159 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
similarity index 92%
rename from compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
rename to compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
index ee6ab8d0dc3..219ba96476a 100644
--- a/compiler/tests-spec/testData/codegen/box/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN CODEGEN BOX SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with long literal mark.
  */
diff --git a/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
new file mode 100644
index 00000000000..803485d0a1b
--- /dev/null
+++ b/compiler/tests-spec/testData/codegen/box/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
@@ -0,0 +1,26 @@
+{
+  "1": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Decimal integer literals with long literal mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/1.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/1.kt
index db170d479cd..2e9dd39178b 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/1.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/1.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 1
  * DESCRIPTION: Type annotations on return type with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/10.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/10.kt
index 730c102fb9b..6aba7aeabf7 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/10.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/10.kt
@@ -6,7 +6,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 10
  * DESCRIPTION: Type annotations on a lambda type with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/11.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/11.kt
index 2e2ae224340..27057b63d25 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/11.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/11.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 11
  * DESCRIPTION: Type annotations with invalid target.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28449
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/2.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/2.kt
index 869b22216e3..66b0c3e7462 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/2.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/2.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 2
  * DESCRIPTION: Type annotations on supertypes with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/3.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/3.kt
index 6d140dab4be..3d0ea9b3e23 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/3.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/3.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 3
  * DESCRIPTION: Type annotations on parameter types with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/4.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/4.kt
index c98062e1ca1..e3726b8983c 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/4.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/4.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 4
  * DESCRIPTION: Type annotations on type arguments for a containing type of return type, with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/5.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/5.kt
index 2b2e8d37e55..6aeeadaf94f 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/5.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/5.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 5
  * DESCRIPTION: Type annotations on upper bounds with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/6.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/6.kt
index aaff2aa52af..453027ffacb 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/6.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/6.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 6
  * DESCRIPTION: Type annotations inside type check and cast expression with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/7.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/7.kt
index 53fa613a239..73579ff51b3 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/7.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/7.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 7
  * DESCRIPTION: Type annotations on a type in an anonymous object expression, with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/8.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/8.kt
index 3f1d74f3ca0..5f36e32e09b 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/8.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/8.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 8
  * DESCRIPTION: Type annotations on a receiver type (for an extension property only), with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/9.kt b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/9.kt
index f18ba1027e0..cac2990b32c 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/9.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/annotations/type-annotations/neg/9.kt
@@ -4,7 +4,6 @@
  * SECTIONS: annotations, type-annotations
  * NUMBER: 9
  * DESCRIPTION: Type annotations on a setter argument type with unresolved reference in parameters.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28424
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/1.kt b/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/1.kt
index 9fc940eb023..1f26eec8424 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/1.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/1.kt
@@ -4,7 +4,6 @@
  * SECTIONS: objects, inheritance
  * NUMBER: 1
  * DESCRIPTION: Access to class members in the super constructor call of an object.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-25289
  */
 
diff --git a/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/2.kt b/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/2.kt
index 70d13e319a4..edc1861cb15 100644
--- a/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/2.kt
+++ b/compiler/tests-spec/testData/codegen/box/notLinked/objects/inheritance/pos/2.kt
@@ -4,7 +4,6 @@
  * SECTIONS: objects, inheritance
  * NUMBER: 2
  * DESCRIPTION: Access to class members in the super constructor call of an object.
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-25289
  */
 
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.kt
index 83aab12d96d..9a8b80b6221 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Checking of type for Boolean values
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.txt
index 4accec93c90..0119f1a2458 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/neg/3.1.txt
@@ -2,11 +2,11 @@ package
 
 public fun case_1(): kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.kt
index df0311ecec0..29a5d11abe9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Checking of type for Boolean values
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.txt
index 4accec93c90..0119f1a2458 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.1.txt
@@ -2,11 +2,11 @@ package
 
 public fun case_1(): kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.kt
index 6543f7b1af4..0ba2f126127 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, boolean-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Checking of subtype for Boolean values
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.txt
index 4accec93c90..0119f1a2458 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/p-1/pos/3.2.txt
@@ -2,11 +2,11 @@ package
 
 public fun case_1(): kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json
new file mode 100644
index 00000000000..37f2eaecbd6
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/boolean-literals/testsMap.json
@@ -0,0 +1,30 @@
+{
+  "1": {
+    "neg": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Checking of type for Boolean values",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Checking of type for Boolean values",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Checking of subtype for Boolean values",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
index d476fc25d26..fc502f1fa74 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with the prefix only.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
index 8f6df38826c..250c8de1ca8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with an underscore after the prefix.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
index 7e757a21b46..2ccdbc336fe 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with an underscore in the first position (it's considered as identifiers).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
index 5a98405e530..e4f05f212a3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with an underscore in the last position.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
new file mode 100644
index 00000000000..0871bbf783d
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
@@ -0,0 +1,34 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Binary integer literals with an underscore after the prefix.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 7,
+          "description": "Binary integer literals with an underscore in the last position.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 11,
+          "description": "Binary integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Binary integer literals with the prefix only.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
index 94d9b02f5bf..1881512f159 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.kt
@@ -1,23 +1,32 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
- * DESCRIPTION: Integer literals with an underscore in the last position.
+ * DESCRIPTION: Integer literals with an underscore in the first position (it's considered as identifiers).
  */
 
 // TESTCASE NUMBER: 1
-val value_1 = <!ILLEGAL_UNDERSCORE!>1_<!>
+val value_1 = <!UNRESOLVED_REFERENCE!>_5678_90<!>
 
 // TESTCASE NUMBER: 2
-val value_2 = <!ILLEGAL_UNDERSCORE!>1_00000000000000000_<!>
+val value_2 = <!UNRESOLVED_REFERENCE!>_2_3_4_5_6_7_8_9_<!>
 
 // TESTCASE NUMBER: 3
-val value_3 = <!ILLEGAL_UNDERSCORE!>1_____________<!>
+val value_3 = <!UNRESOLVED_REFERENCE!>_____________0000<!>
 
 // TESTCASE NUMBER: 4
-val value_4 = <!ILLEGAL_UNDERSCORE!>9____________0_<!>
+val value_4 = <!UNRESOLVED_REFERENCE!>_______________________________________________________________________________________________________________________________________________________0<!>
 
 // TESTCASE NUMBER: 5
-val value_5 = <!ILLEGAL_UNDERSCORE!>1_______________________________________________________________________________________________________________________________________________________<!>
+val value_5 = <!UNRESOLVED_REFERENCE!>____________________________________________________<!>
+
+// TESTCASE NUMBER: 6
+val value_6 = <!UNRESOLVED_REFERENCE!>_<!>
+
+// TESTCASE NUMBER: 7
+val value_7 = <!UNRESOLVED_REFERENCE!>_0_<!>
+
+// TESTCASE NUMBER: 8
+val value_8 = <!UNRESOLVED_REFERENCE!>_9_<!>
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt
index 7da3f695aca..7545aba43f2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.1.txt
@@ -1,7 +1,10 @@
 package
 
-public val value_1: kotlin.Int = 1
-public val value_2: kotlin.Long = 100000000000000000.toLong()
-public val value_3: kotlin.Int = 1
-public val value_4: kotlin.Int = 90
-public val value_5: kotlin.Int = 1
+public val value_1: [ERROR : Type for _5678_90]
+public val value_2: [ERROR : Type for _2_3_4_5_6_7_8_9_]
+public val value_3: [ERROR : Type for _____________0000]
+public val value_4: [ERROR : Type for _______________________________________________________________________________________________________________________________________________________0]
+public val value_5: [ERROR : Type for ____________________________________________________]
+public val value_6: [ERROR : Type for _]
+public val value_7: [ERROR : Type for _0_]
+public val value_8: [ERROR : Type for _9_]
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
index 653f3e9d424..d0ea7a25cb7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Integer literals with an underscore in the first position (it's considered as identifiers).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.kt
new file mode 100644
index 00000000000..62152d27953
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.kt
@@ -0,0 +1,32 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
+ * NUMBER: 3
+ * DESCRIPTION: Integer literals with an underscore in the first position (it's considered as identifiers).
+ */
+
+// TESTCASE NUMBER: 1
+val value_1 = <!UNRESOLVED_REFERENCE!>_5678_90<!>
+
+// TESTCASE NUMBER: 2
+val value_2 = <!UNRESOLVED_REFERENCE!>_2_3_4_5_6_7_8_9_<!>
+
+// TESTCASE NUMBER: 3
+val value_3 = <!UNRESOLVED_REFERENCE!>_____________0000<!>
+
+// TESTCASE NUMBER: 4
+val value_4 = <!UNRESOLVED_REFERENCE!>_______________________________________________________________________________________________________________________________________________________0<!>
+
+// TESTCASE NUMBER: 5
+val value_5 = <!UNRESOLVED_REFERENCE!>____________________________________________________<!>
+
+// TESTCASE NUMBER: 6
+val value_6 = <!UNRESOLVED_REFERENCE!>_<!>
+
+// TESTCASE NUMBER: 7
+val value_7 = <!UNRESOLVED_REFERENCE!>_0_<!>
+
+// TESTCASE NUMBER: 8
+val value_8 = <!UNRESOLVED_REFERENCE!>_9_<!>
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt
new file mode 100644
index 00000000000..7545aba43f2
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/2.3.txt
@@ -0,0 +1,10 @@
+package
+
+public val value_1: [ERROR : Type for _5678_90]
+public val value_2: [ERROR : Type for _2_3_4_5_6_7_8_9_]
+public val value_3: [ERROR : Type for _____________0000]
+public val value_4: [ERROR : Type for _______________________________________________________________________________________________________________________________________________________0]
+public val value_5: [ERROR : Type for ____________________________________________________]
+public val value_6: [ERROR : Type for _]
+public val value_7: [ERROR : Type for _0_]
+public val value_8: [ERROR : Type for _9_]
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..78e591d25a7
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
@@ -0,0 +1,26 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 8,
+          "description": "Integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 8,
+          "description": "Integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 8,
+          "description": "Integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
index e4095d24ca4..2e17b8be3a4 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with the prefix only.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
index f418971669d..2b543393cd8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with an underscore after the prefix.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
index 77d675a33e4..512600e3a0c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with an underscore in the first position (it's considered as identifiers).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
index 2e0ae8d787c..0e0d2680da5 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.kt
@@ -1,29 +1,41 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
- * DESCRIPTION: Hexadecimal integer literals with an underscore in the last position.
+ * DESCRIPTION: Hexadecimal integer literals with an underscore in the first position (it's considered as identifiers).
  */
 
 // TESTCASE NUMBER: 1
-val value_1 = <!ILLEGAL_UNDERSCORE!>0x3_4_5_6_7_8_____<!>
+val value_1 = <!UNRESOLVED_REFERENCE!>_____0x3_4_5_6_7_8<!>
 
 // TESTCASE NUMBER: 2
-val value_2 = <!ILLEGAL_UNDERSCORE!>0X4_______5_______6_______7_<!>
+val value_2 = <!UNRESOLVED_REFERENCE!>_0X4_______5_______6_______7<!>
 
 // TESTCASE NUMBER: 3
-val value_3 = <!ILLEGAL_UNDERSCORE!>0X000000000_<!>
+val value_3 = <!UNRESOLVED_REFERENCE!>_0_0X4_3_4_5_6_7_8_9<!>
+
+// TESTCASE NUMBER: 4
+val value_4 = <!UNRESOLVED_REFERENCE!>_0X000000000<!>
 
 // TESTCASE NUMBER: 5
-val value_5 = <!ILLEGAL_UNDERSCORE, INT_LITERAL_OUT_OF_RANGE!>0x_<!>
+val value_5 = <!UNRESOLVED_REFERENCE!>_0000000000x<!>
 
 // TESTCASE NUMBER: 6
-val value_6 = <!ILLEGAL_UNDERSCORE, INT_LITERAL_OUT_OF_RANGE!>0X______________<!>
+val value_6 = <!UNRESOLVED_REFERENCE!>_0_9x<!>
 
 // TESTCASE NUMBER: 7
-val value_7 = <!ILLEGAL_UNDERSCORE!>0X0_<!>
+val value_7 = <!UNRESOLVED_REFERENCE!>____________0x<!>
 
 // TESTCASE NUMBER: 8
-val value_8 = <!ILLEGAL_UNDERSCORE!>0X10_<!>
+val value_8 = <!UNRESOLVED_REFERENCE!>_0_x_0<!>
+
+// TESTCASE NUMBER: 9
+val value_9 = <!UNRESOLVED_REFERENCE!>_x_0<!>
+
+// TESTCASE NUMBER: 10
+val value_10 = <!UNRESOLVED_REFERENCE!>_x<!>
+
+// TESTCASE NUMBER: 11
+val value_11 = <!UNRESOLVED_REFERENCE!>_x_<!>
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt
index d17a157d87c..565b7d2f196 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.3.txt
@@ -1,9 +1,13 @@
 package
 
-public val value_1: kotlin.Int = 3430008
-public val value_2: kotlin.Int = 17767
-public val value_3: kotlin.Int = 0
-public val value_5: kotlin.Int
-public val value_6: kotlin.Int
-public val value_7: kotlin.Int = 0
-public val value_8: kotlin.Int = 16
+public val value_1: [ERROR : Type for _____0x3_4_5_6_7_8]
+public val value_10: [ERROR : Type for _x]
+public val value_11: [ERROR : Type for _x_]
+public val value_2: [ERROR : Type for _0X4_______5_______6_______7]
+public val value_3: [ERROR : Type for _0_0X4_3_4_5_6_7_8_9]
+public val value_4: [ERROR : Type for _0X000000000]
+public val value_5: [ERROR : Type for _0000000000x]
+public val value_6: [ERROR : Type for _0_9x]
+public val value_7: [ERROR : Type for ____________0x]
+public val value_8: [ERROR : Type for _0_x_0]
+public val value_9: [ERROR : Type for _x_0]
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.kt
new file mode 100644
index 00000000000..4c5b7265bc2
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.kt
@@ -0,0 +1,29 @@
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * NUMBER: 4
+ * DESCRIPTION: Hexadecimal integer literals with an underscore in the last position.
+ */
+
+// TESTCASE NUMBER: 1
+val value_1 = <!ILLEGAL_UNDERSCORE!>0x3_4_5_6_7_8_____<!>
+
+// TESTCASE NUMBER: 2
+val value_2 = <!ILLEGAL_UNDERSCORE!>0X4_______5_______6_______7_<!>
+
+// TESTCASE NUMBER: 3
+val value_3 = <!ILLEGAL_UNDERSCORE!>0X000000000_<!>
+
+// TESTCASE NUMBER: 5
+val value_5 = <!ILLEGAL_UNDERSCORE, INT_LITERAL_OUT_OF_RANGE!>0x_<!>
+
+// TESTCASE NUMBER: 6
+val value_6 = <!ILLEGAL_UNDERSCORE, INT_LITERAL_OUT_OF_RANGE!>0X______________<!>
+
+// TESTCASE NUMBER: 7
+val value_7 = <!ILLEGAL_UNDERSCORE!>0X0_<!>
+
+// TESTCASE NUMBER: 8
+val value_8 = <!ILLEGAL_UNDERSCORE!>0X10_<!>
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.txt
new file mode 100644
index 00000000000..d17a157d87c
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.4.txt
@@ -0,0 +1,9 @@
+package
+
+public val value_1: kotlin.Int = 3430008
+public val value_2: kotlin.Int = 17767
+public val value_3: kotlin.Int = 0
+public val value_5: kotlin.Int
+public val value_6: kotlin.Int
+public val value_7: kotlin.Int = 0
+public val value_8: kotlin.Int = 16
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..a71900d0dad
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
@@ -0,0 +1,40 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Hexadecimal integer literals with an underscore after the prefix.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 7,
+          "description": "Hexadecimal integer literals with an underscore in the last position.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 11,
+          "description": "Hexadecimal integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 11,
+          "description": "Hexadecimal integer literals with an underscore in the first position (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Hexadecimal integer literals with the prefix only.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/testsMap.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/testsMap.txt
deleted file mode 100644
index e7b3c0f681f..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/testsMap.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * This file is generated by {@link org.jetbrains.kotlin.spec.tasks.generateTests}. DO NOT MODIFY MANUALLY.
- * This file is used in the HTML version of the Kotlin Specification (https://kotlin.github.io/kotlin-spec) to show tests coverage for sentences.
- *
- * Content format:
- *
- * {paragraphNumber}
- *     {testType: neg|pos}: {sentenceNumber}-{numberOfTests|testPathToAnotherSection}, ...
- */
-
-1
-    neg: 2-5, 1-3
-    pos: 2-5
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
index 31420bce926..fe63b027ab1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals separeted by comments.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
index 0e3a5976527..a0fc6579cb5 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) separeted by comments.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
index 6d071e575c9..4d819983f0e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
index 745bf26b398..54753c393b8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a many digits in a whole-number part and a fraction part (including conforms).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
index 1de2435d42a..6bfb24a7457 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
index 78d594b4432..36508745ac2 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part  (including conforms).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
index a8eec4de2ce..dc5b3cfec36 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals without digits after an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
index ae3bd139fe0..eabfbaeda61 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a not allowed exponent mark at the beginning.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
index bfb04219f07..5518a79c609 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
index 38c4e4d0132..e23efe03213 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
index 70ac631a0a9..602614809fd 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
index 71a8b9b8707..b5d4a97ff51 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
index b5e875df789..169f56a47c0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark without digits after it.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
index e7a9730c8bf..4c02691f1a3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
index bda534805c6..a91329a19ff 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark without digits after it.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
index b703b75c2cc..2a4e3b7b515 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
index b0d6bd577a4..2bc317ffdc5 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
index 0c76be6e685..54c0f6d8ea3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals separeted by comments with omitted a whole-number part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
index dcfd22e8ddc..393693b96e9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
index eba4c61977b..1f620b44da0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
index 12c951a6349..9916126c0e5 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
index fd8ba2349e9..cc44c890db4 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
index 59bd3b4d122..bf45b2a80da 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
index d5b5cda1853..dee59798722 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals without digits after an exponent mark and with undescores in the different pisitions.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
index d6ea385955b..afdc706b705 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores at the end.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.kt
index 3fd116b023f..2632515bf2c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores before an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.kt
index 7ffc2da8938..fd8c248f2cf 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores after an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.kt
index 0598582b175..b6b9225a6a0 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/neg/2.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with underscores around an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
index 03dd6ea39cf..70f34920679 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
index 34853fd9e71..99c79b1c342 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
index b8e5b8e9cb5..8fa1ca29d8d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
index cb70a438a49..b1106c6d840 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
index 5e9457aa57a..f7b0d99ec09 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.kt
index 95841b5cfba..f292a07d956 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: A type checking of a simple real literal (with/without underscores).
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.txt
index a1a0b4a413d..8b92f8c5165 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.1.txt
@@ -15,11 +15,11 @@ public val value_7: kotlin.Unit
 public val value_8: kotlin.Unit
 public val value_9: kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.kt
index e23af41a372..0bc3fa63452 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: A type checking of a real literal with an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.txt
index f1e1f8cd21e..6371ef4cbb8 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.2.txt
@@ -40,11 +40,11 @@ public val value_7: kotlin.Unit
 public val value_8: kotlin.Unit
 public val value_9: kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.kt
index b9429a2a42e..0290748e84a 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: A type checking of a real literal with omitted a whole-number part.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.txt
index e61e05a6b3d..a64333a362e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.3.txt
@@ -30,11 +30,11 @@ public val value_7: kotlin.Unit
 public val value_8: kotlin.Unit
 public val value_9: kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.kt
index 89ce4c4c19b..e38c102d858 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: A type checking of a real literal with omitted a whole-number part and an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.txt
index 1c63ccdafc4..ecd7a1fdd17 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.4.txt
@@ -31,11 +31,11 @@ public val value_7: kotlin.Unit
 public val value_8: kotlin.Unit
 public val value_9: kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.kt
index 509d4eb8399..626fe7113aa 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.kt
@@ -1,7 +1,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, constant-literals, real-literals -> paragraph 5 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: A type checking of a real literal with omitted a fraction part and an exponent mark.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.txt
index ff0ecf7a42a..256d7f77fb1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/p-5/pos/1.5.txt
@@ -24,11 +24,11 @@ public val value_7: kotlin.Unit
 public val value_8: kotlin.Unit
 public val value_9: kotlin.Unit
 public fun </*0*/ T> checkSubtype(/*0*/ t: T): T
-public fun </*0*/ E> Inv<E>.check(): kotlin.Unit
-public infix fun </*0*/ T> T.checkType(/*0*/ f: Inv<T>.() -> kotlin.Unit): kotlin.Unit
+public fun </*0*/ E> CheckType<E>.check(): kotlin.Unit
+public infix fun </*0*/ T> T.checkType(/*0*/ f: CheckType<T>.() -> kotlin.Unit): kotlin.Unit
 
-public final class Inv</*0*/ T> {
-    public constructor Inv</*0*/ T>()
+public final class CheckType</*0*/ T> {
+    public constructor CheckType</*0*/ T>()
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json
new file mode 100644
index 00000000000..8a5f01ec769
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.json
@@ -0,0 +1,286 @@
+{
+  "1": {
+    "neg": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "Real literals suffixed by f/F (float suffix) separeted by comments.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "Real literals separeted by comments.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 12,
+          "description": "Real literals with a many digits in a whole-number part and a fraction part (including conforms).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 35,
+          "description": "Simple real literals with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 35,
+          "description": "Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 12,
+          "description": "Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part  (including conforms).",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "4": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 14,
+          "description": "Real literals with underscores before an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 26,
+          "description": "Real literals with underscores around an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 29,
+          "description": "Real literals with underscores after an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 15,
+          "description": "Real literals with underscores at the end.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 15,
+          "description": "Real literals without digits after an exponent mark and with undescores in the different pisitions.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 27,
+          "description": "Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 27,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 29,
+          "description": "Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 31,
+          "description": "Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 27,
+          "description": "Real literals with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 9,
+          "description": "Real literals with omitted a fraction part and an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 17,
+          "description": "Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 17,
+          "description": "Real literals with omitted a whole-number part and an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 25,
+          "description": "Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 23,
+          "description": "Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 23,
+          "description": "Real literals with omitted a fraction part and an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 30,
+          "description": "Real literals with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "Real literals separeted by comments with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 23,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 26,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 29,
+          "description": "Simple real literals with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 13,
+          "description": "Real literals with a not allowed exponent mark at the beginning.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 13,
+          "description": "Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 17,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 17,
+          "description": "Real literals without digits after an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 26,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 39,
+          "description": "Simple real literals with an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "5": {
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 39,
+          "description": "A type checking of a real literal with an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 29,
+          "description": "A type checking of a real literal with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 30,
+          "description": "A type checking of a real literal with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 23,
+          "description": "A type checking of a real literal with omitted a fraction part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 14,
+          "description": "A type checking of a simple real literal (with/without underscores).",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.txt
index 3b5cf66fec4..fe5996f47b7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.txt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/real-literals/testsMap.txt
@@ -9,8 +9,8 @@
  */
 
 1
-    pos: 1-2, 1-type-system/introduction/7/pos/1.1.kt, 3-2
     neg: 3-1, 1-1
+    pos: 1-2, 3-2
 4
     neg: 2-3, 1-2
     pos: 1-5
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
similarity index 85%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
index 708d9acff51..e370d2c7fc6 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary and hexadecimal integer literals with a long literal mark only.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
similarity index 78%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
index f88ab2bbc6f..32043d93b12 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Various integer literals with a not allowed underscore before the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.txt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
similarity index 75%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
index 112bdecea74..88f2217a7da 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Various integer literals with not allowed long literal mark in lower case.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.txt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.1.kt
similarity index 82%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.1.kt
index 5760618811f..4bb068ed692 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Various integer literals with not allowed long literal mark in lower case (type checking).
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.kt
similarity index 88%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.kt
index 0c593e79639..9359da23491 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Type checking (comparison with invalid types) of various integer literals with long literal mark.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.kt
similarity index 97%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.kt
index d4b63c28981..5e384a74fdb 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.3.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Type checking (comparison with invalid types) of various integer literals.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.kt
similarity index 91%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.kt
index 9b926d3ab67..d0ee23e9571 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.4.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Type checking (comparison with invalid types) of too a big integers.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.5.kt
similarity index 93%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.5.kt
index 0202c28b7ae..910dcda6a4a 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/neg/2.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/2.5.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: Check of integer type selection depends on the context (incopatible types).
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.1.kt
similarity index 87%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.1.kt
index 52a28891dc5..ac42145aed4 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Type checking of various integer literals with long literal mark.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.kt
similarity index 93%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.kt
index 7747c0d0f90..31ed0b80812 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Type checking of decimal integer literals.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.kt
similarity index 93%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.kt
index 4d3351404d3..7b90dc79650 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.3.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Type checking of hexadecimal integer literals.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.kt
similarity index 95%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.kt
index 511574260db..21ed2b491f9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.4.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Type checking of binary integer literals.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.5.kt
similarity index 88%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.5.kt
index c26144a08a1..c6cbb9df50e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/integer-literals/long-integer-literals/p-1/pos/2.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/2.5.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 5
  * DESCRIPTION: Check of integer type selection depends on the context.
  * HELPERS: checkType
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
new file mode 100644
index 00000000000..6be38ff9b56
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
@@ -0,0 +1,92 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Various integer literals with not allowed long literal mark in lower case (type checking).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Check of integer type selection depends on the context (incopatible types).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Type checking (comparison with invalid types) of too a big integers.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "Type checking (comparison with invalid types) of various integer literals.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Type checking (comparison with invalid types) of various integer literals with long literal mark.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Various integer literals with a not allowed underscore before the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Various integer literals with not allowed long literal mark in lower case.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 8,
+          "description": "Binary and hexadecimal integer literals with a long literal mark only.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Type checking of various integer literals with long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Check of integer type selection depends on the context.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 5,
+          "description": "Type checking of binary integer literals.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 5,
+          "description": "Type checking of hexadecimal integer literals.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 5,
+          "description": "Type checking of decimal integer literals.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.1.kt
index 6926a1b984c..e6d4e146a27 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.1.kt
@@ -3,7 +3,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Non-exhaustive when, without bound value, without else branch.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.2.kt
index 93673c8643e..c60b88a6b6e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/1.2.kt
@@ -4,7 +4,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Non-exhaustive when, with bound value, without else branch.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.1.kt
similarity index 91%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.1.kt
index c4ad33f655f..47e5dcd643d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.1.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
  * NUMBER: 1
  * DESCRIPTION: Non-exhaustive when using nullable boolean values.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.2.kt
similarity index 97%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.2.kt
index 0e1a77b637f..b92cb87e6b7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.2.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
  * NUMBER: 2
  * DESCRIPTION: Non-exhaustive when using subclasses of the nullable sealed class.
  * HELPERS: sealedClasses
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.3.kt
similarity index 95%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.3.kt
index 6a162430152..6e46d5a96ce 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/8.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/10.3.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
  * NUMBER: 3
  * DESCRIPTION: Non-exhaustive when using nullable enum values.
  * HELPERS: enumClasses
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/3.1.kt
index 60cd453b4da..4be723494a7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/3.1.kt
@@ -4,7 +4,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Non-exhaustive when using boolean values.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/6.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/6.1.kt
index 2192920f453..b2e1d861427 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/6.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/6.1.kt
@@ -4,7 +4,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: Non-exhaustive when using subclasses of the sealed class.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/7.1.kt
deleted file mode 100644
index fea8a75a418..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/neg/7.1.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 7
- * NUMBER: 1
- * DESCRIPTION: Non-exhaustive when using enum values.
- * HELPERS: enumClasses
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: EnumClass): String = <!NO_ELSE_IN_WHEN!>when<!>(value_1) {
-    EnumClass.EAST -> ""
-    EnumClass.SOUTH -> ""
-    EnumClass.NORTH -> ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: EnumClass): String = <!NO_ELSE_IN_WHEN!>when<!>(value_1) {
-    EnumClass.EAST, EnumClass.SOUTH, EnumClass.NORTH -> ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: EnumClass): String = <!NO_ELSE_IN_WHEN!>when<!>(value_1) {
-    EnumClass.EAST -> ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: EnumClass): String = <!NO_ELSE_IN_WHEN!>when<!>(value_1) { }
-
-// TESTCASE NUMBER: 5
-fun case_5(value_1: EnumClassSingle): String = <!NO_ELSE_IN_WHEN!>when<!>(value_1) { }
-
-/*
- * TESTCASE NUMBER: 6
- * DISCUSSION: maybe use const propagation here?
- * ISSUES: KT-25265
- */
-fun case_6(value_1: EnumClass): String {
-    val west = EnumClass.WEST
-
-    return <!NO_ELSE_IN_WHEN!>when<!> (value_1) {
-        EnumClass.EAST -> ""
-        EnumClass.SOUTH -> ""
-        EnumClass.NORTH -> ""
-        west -> ""
-    }
-}
-
-/*
- * TESTCASE NUMBER: 7
- * DISCUSSION
- * ISSUES: KT-26044
- */
-fun case_7(value_1: EnumClassEmpty): String = <!NO_ELSE_IN_WHEN!>when<!> (value_1) { }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.1.kt
index ed968059d5b..e94f70ea759 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.1.kt
@@ -3,7 +3,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Exhaustive when, without bound value, with else branch.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.2.kt
index bdc2e8bd08d..6a20967cdd9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.2.kt
@@ -4,7 +4,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Exhaustive when, with bound value, with else branch.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.3.kt
index 1bcb5663bde..028b969885b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/1.3.kt
@@ -3,7 +3,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Exhaustive when, with bound value (sealed, enum, boolean), with redundant else branch.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.1.kt
new file mode 100644
index 00000000000..440464fddb4
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.1.kt
@@ -0,0 +1,24 @@
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
+ * NUMBER: 1
+ * DESCRIPTION: Exhaustive when using nullable boolean values.
+ */
+
+// TESTCASE NUMBER: 1
+fun case_1(value_1: Boolean?): String = when (value_1) {
+    true -> ""
+    false -> ""
+    null -> ""
+}
+
+// TESTCASE NUMBER: 2
+fun case_2(value_1: Boolean?): String = when (value_1) {
+    true && false && ((true || false)) || true && !!!false && !!!true -> ""
+    true && false && ((true || false)) || true && !!!false -> ""
+    null -> ""
+}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.2.kt
similarity index 85%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.2.kt
index d9359ae5bce..467ee83e5bb 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.2.kt
@@ -3,10 +3,10 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
  * NUMBER: 2
- * DESCRIPTION: Exhaustive when using enum values.
+ * DESCRIPTION: Exhaustive when using nullable enum values.
  * HELPERS: enumClasses
  */
 
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.3.kt
similarity index 97%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.3.kt
index 6e19b91f57c..32cfc5f2e84 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/10.3.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 10
  * NUMBER: 3
  * DESCRIPTION: Exhaustive when using subclasses of the nullable sealed class.
  * HELPERS: sealedClasses
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/3.1.kt
index e5ee9438121..14bb8903bfe 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/3.1.kt
@@ -3,7 +3,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Exhaustive when using boolean values.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/6.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/6.1.kt
index d2f82eb1457..063425dd808 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/6.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/6.1.kt
@@ -4,7 +4,7 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: Exhaustive when using subclasses of the sealed class.
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/7.1.kt
deleted file mode 100644
index 6d0952d2109..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/7.1.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 7
- * NUMBER: 1
- * DESCRIPTION: Exhaustive when using enum values.
- * HELPERS: enumClasses
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(dir: EnumClass): String = when (dir) {
-    EnumClass.EAST -> ""
-    EnumClass.NORTH -> ""
-    EnumClass.SOUTH -> ""
-    EnumClass.WEST -> ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: EnumClassSingle): String = when (value_1) {
-    EnumClassSingle.EVERYTHING -> ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.1.kt
index df6302a19ef..fdf50a5138e 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/p-2/pos/8.1.kt
@@ -3,22 +3,22 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression, exhaustive-when-expressions -> paragraph 2 -> sentence 8
  * NUMBER: 1
- * DESCRIPTION: Exhaustive when using nullable boolean values.
+ * DESCRIPTION: Exhaustive when using enum values.
+ * HELPERS: enumClasses
  */
 
 // TESTCASE NUMBER: 1
-fun case_1(value_1: Boolean?): String = when (value_1) {
-    true -> ""
-    false -> ""
-    null -> ""
+fun case_1(dir: EnumClass): String = when (dir) {
+    EnumClass.EAST -> ""
+    EnumClass.NORTH -> ""
+    EnumClass.SOUTH -> ""
+    EnumClass.WEST -> ""
 }
 
 // TESTCASE NUMBER: 2
-fun case_2(value_1: Boolean?): String = when (value_1) {
-    true && false && ((true || false)) || true && !!!false && !!!true -> ""
-    true && false && ((true || false)) || true && !!!false -> ""
-    null -> ""
+fun case_2(value_1: EnumClassSingle): String = when (value_1) {
+    EnumClassSingle.EVERYTHING -> ""
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json
new file mode 100644
index 00000000000..fc8bf486751
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/exhaustive-when-expressions/testsMap.json
@@ -0,0 +1,122 @@
+{
+  "2": {
+    "neg": {
+      "10": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "Non-exhaustive when using nullable enum values.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 10,
+          "description": "Non-exhaustive when using subclasses of the nullable sealed class.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "Non-exhaustive when using nullable boolean values.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "Non-exhaustive when, with bound value, without else branch.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "Non-exhaustive when, without bound value, without else branch.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 5,
+          "description": "Non-exhaustive when using boolean values.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "6": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 12,
+          "description": "Non-exhaustive when using subclasses of the sealed class.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "10": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 7,
+          "description": "Exhaustive when using subclasses of the nullable sealed class.",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "Exhaustive when using nullable enum values.",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Exhaustive when using nullable boolean values.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 4,
+          "description": "Exhaustive when, with bound value, with else branch.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 8,
+          "description": "Exhaustive when, with bound value (sealed, enum, boolean), with redundant else branch.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "Exhaustive when, without bound value, with else branch.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Exhaustive when using boolean values.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "8": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Exhaustive when using enum values.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "6": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 9,
+          "description": "Exhaustive when using subclasses of the sealed class.",
+          "unexpectedBehaviour": true
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.1.kt
similarity index 71%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.1.kt
index ee861aadca5..641f8990a85 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty when with bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.2.kt
similarity index 66%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.2.kt
index 6ca7cf89a91..ee6743fdf2b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-1/pos/3.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty when without bound value.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/1.1.kt
similarity index 86%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/1.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/1.1.kt
index b166019fc01..9d65244fab7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/1.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Forbidden break and continue in the control structure body of when.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.1.kt
similarity index 87%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.1.kt
index df14b50f781..6f33f804c59 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: When with non-boolean value in the when condition.
  * HELPERS: typesProvider
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.2.kt
similarity index 90%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.2.kt
index 828a19d3191..ecec1ce41df 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/neg/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/neg/2.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: When without bound value, forbidden comma in the when condition.
  * HELPERS: typesProvider, classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/1.1.kt
similarity index 98%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/1.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/1.1.kt
index 5857f0922ec..cf27dd68098 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/1.1.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: When without bound value, various expressions in the control structure body.
  * HELPERS: typesProvider, classes, functions
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.1.kt
index 0925994c9c6..565732345d3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: When without bound value, various boolean values in the when condition.
  * HELPERS: typesProvider, enumClasses, sealedClasses, classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.2.kt
similarity index 77%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.2.kt
index 15c4576c584..07d449228ba 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and only one 'else' branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.3.kt
similarity index 97%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.3.kt
index 74a311c605c..dcdc99d37a3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-2/pos/2.3.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: 'When' without bound value and with Nothing in condition (subtype of Boolean).
  * DISCUSSION
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.kt
index 9b8a2dbeebe..ab29190f9e3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/neg/1.1.kt
@@ -3,31 +3,32 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: 'When' without bound value and with 'else' branch not in the last position.
+ * DESCRIPTION: 'When' with bound value and not allowed break and continue expression (without labels) in the control structure body.
  */
 
 // TESTCASE NUMBER: 1
-fun case_1(<!UNUSED_PARAMETER!>value_1<!>: Int): String = when {
-    <!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
-    <!UNREACHABLE_CODE!>value_1 == 1 -> ""<!>
+fun case_1(value_1: Int): Int {
+    while (true) {
+        when (value_1) {
+            1 -> return 1
+            2 -> <!BREAK_OR_CONTINUE_IN_WHEN!>break<!>
+        }
+    }
+
+    return 0
 }
 
 // TESTCASE NUMBER: 2
-fun case_2(value_1: Int): String = when {
-    value_1 == 1 -> ""
-    <!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
-    <!UNREACHABLE_CODE!>value_1 == 2 -> ""<!>
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(): String {
-    when {
-        <!ELSE_MISPLACED_IN_WHEN!>else<!> -> return ""
-        <!UNREACHABLE_CODE!>else -> return ""<!>
+fun case_2(value_1: Int): Int {
+    while (true) {
+        when (value_1) {
+            1 -> <!BREAK_OR_CONTINUE_IN_WHEN!>continue<!>
+            2 -> return 1
+        }
     }
 
-    <!UNREACHABLE_CODE!>return ""<!>
+    <!UNREACHABLE_CODE!>return 0<!>
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt
index 3e703fb3844..da93bc9e5db 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-5/pos/1.1.kt
@@ -1,26 +1,322 @@
+// !DIAGNOSTICS: -UNUSED_EXPRESSION
 // SKIP_TXT
 
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: 'When' without bound value and with else branch in the last position.
+ * DESCRIPTION: 'When' with bound value and with different variants of expressions in the control structure body.
+ * HELPERS: typesProvider, classes, functions
  */
 
 // TESTCASE NUMBER: 1
-fun case_1(value_1: Int): String {
-    when {
-        value_1 == 1 -> return ""
-        value_1 == 2 -> return ""
-        else -> return ""
+fun case_1(value_1: Int) {
+    when (value_1) {
+        1 -> true
+        2 -> 100
+        3 -> -.09f
+        4 -> '.'
+        5 -> "..."
+        6 -> null
     }
 }
 
 // TESTCASE NUMBER: 2
-fun case_2(value_1: Int): String = when {
-    value_1 == 1 -> ""
-    value_1 == 2 -> ""
-    else -> ""
+fun case_2(value_1: Int, value_2: Byte, value_3: TypesProvider) {
+    when (value_1) {
+        1 -> -.09 % 10L
+        3 -> value_2 / -5
+        2 -> value_3.getChar() - 11 + 90
+        4 -> 100
+    }
+}
+
+// TESTCASE NUMBER: 3
+fun case_3(value_1: Int, value_2: Boolean, value_3: Long) {
+    when (value_1) {
+        1 -> value_2
+        2 -> !value_2
+        3 -> getBoolean() && value_2
+        5 -> getChar() != 'a'
+        6 -> getList() === getAny()
+        7 -> value_3 <= 11
+    }
+}
+
+// TESTCASE NUMBER: 4
+fun case_4(value_1: Int, value_2: String, value_3: String) {
+    when (value_1) {
+        1 -> "..." + value_2 + "" + "$value_3" + "..."
+        2 -> value_2 + getString()
+    }
+}
+
+// TESTCASE NUMBER: 5
+fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
+    when (value_1) {
+        1 -> when (value_3) {
+            value_2 > 1000 -> "1"
+            value_2 > 100 -> "2"
+            else -> "3"
+        }
+        2 -> when (value_3) {
+            value_2 > 1000 -> "1"
+            value_2 > 100 -> "2"
+        }
+        3 -> when (value_3) {}
+        4 -> when (value_3) {
+            true -> "1"
+            false -> "2"
+            null -> "3"
+        }
+        5 -> when (value_3) {
+            true -> "1"
+            false -> "2"
+        }
+        6 -> when (value_3) {}
+    }
+}
+
+// TESTCASE NUMBER: 6
+fun case_6(value_1: Int, value_2: Int, value_3: Boolean?) = when (value_1) {
+    1 -> when (value_3) {
+        value_2 > 1000 -> 1
+        value_2 > 100 -> 2
+        else -> 3
+    }
+    else -> when (value_3) {
+        true -> 1
+        false -> 2
+        null -> 3
+    }
+}
+
+// TESTCASE NUMBER: 7
+fun case_7(value_1: Int, value_2: Int, value_3: Boolean?) {
+    when (value_1) {
+        1 -> if (value_2 > 1000) "1"
+        2 -> if (value_2 > 1000) "1"
+            else "2"
+        3 -> if (value_2 < 100) "1"
+            else if (value_2 < 10) "2"
+            else "4"
+        4 -> if (value_3 == null) "1"
+            else if (<!DEBUG_INFO_SMARTCAST!>value_3<!>) "2"
+            else if (!<!DEBUG_INFO_SMARTCAST!>value_3<!>) "3"
+    }
+}
+
+// TESTCASE NUMBER: 8
+fun case_8(value_1: Int, value_2: Int) = when (value_1) {
+    1 -> if (value_2 > 1000) "1"
+    else "2"
+    else -> if (value_2 < 100) "1"
+    else if (value_2 < 10) "2"
+    else "4"
+}
+
+// TESTCASE NUMBER: 9
+fun case_9(value_1: Int, value_2: String, value_3: String): Any {
+    return when (value_1) {
+        1 -> try { 4 } catch (e: Exception) { 5 }
+        2 -> try { throw Exception() } catch (e: Exception) { value_2 }
+        else -> try { throw Exception() } catch (e: Exception) { {value_3} } finally { }
+    }
+}
+
+// TESTCASE NUMBER: 10
+fun case_10(value_1: Int, value_2: String?, value_3: String?) {
+    when (value_1) {
+        1 -> value_2 ?: true
+        2 -> value_2 ?: value_3 ?: true
+        3 -> value_2!! <!USELESS_ELVIS!>?: true<!>
+    }
+}
+
+// TESTCASE NUMBER: 11
+fun case_11(value_1: Int) {
+    when (value_1) {
+        1 -> 1..10
+        2 -> -100L..100L
+        3 -> -getInt()..getLong()
+    }
+}
+
+// TESTCASE NUMBER: 12
+fun case_12(value_1: Int, value_2: Collection<Int>, value_3: Collection<Int>?) {
+    when (value_1) {
+        1 -> value_2 as List<Int>
+        2 -> value_2 as? List<Int>
+        3 -> value_3 <!UNCHECKED_CAST!>as? MutableMap<Int, Int><!>
+        4 -> (value_2 <!UNCHECKED_CAST!>as? Map<Int, Int><!>) as MutableMap<Int, Int>
+    }
+}
+
+// TESTCASE NUMBER: 13
+fun case_13(value_1: Int, value_2: Int, value_3: Int, value_4: Boolean) {
+    var mutableValue1 = value_2
+    var mutableValue2 = value_3
+
+    when (value_1) {
+        1 -> ++mutableValue1
+        2 -> --mutableValue2
+        3 -> !value_4
+    }
+}
+
+// TESTCASE NUMBER: 14
+fun case_14(value_1: Int, value_2: Int, value_3: Int, value_4: Boolean?) {
+    var mutableValue1 = value_2
+    var mutableValue2 = value_3
+
+    when (value_1) {
+        1 -> <!UNUSED_CHANGED_VALUE!>mutableValue1++<!>
+        2 -> <!UNUSED_CHANGED_VALUE!>mutableValue2--<!>
+        3 -> value_4!!
+    }
+}
+
+// TESTCASE NUMBER: 15
+fun case_15(value_1: Int, value_2: List<Int>, value_3: List<List<List<List<Int>>>>) {
+    when (value_1) {
+        1 -> value_2[0]
+        2 -> value_3[0][-4][1][-1]
+    }
+}
+
+// TESTCASE NUMBER: 16
+fun case_16(value_1: Int, value_2: Class, value_3: Class?, value_4: Int) {
+    fun __fun_1(): () -> Unit { return fun() { } }
+
+    when (value_1) {
+        1 -> funWithoutArgs()
+        2 -> __fun_1()()
+        3 -> value_2.fun_2(value_4)
+        4 -> value_3?.fun_2(value_4)
+        5 -> value_3!!.fun_2(value_4)
+    }
+}
+
+// TESTCASE NUMBER: 17
+fun case_17(value_1: Int, value_2: Class, value_3: Class?) {
+    when (value_1) {
+        1 -> value_2.prop_1
+        2 -> value_3?.prop_1
+        3 -> value_2::prop_1.get()
+        4 -> value_3!!::prop_3.get()
+    }
+}
+
+// TESTCASE NUMBER: 18
+fun case_18(value_1: Int) {
+    val fun_1 = fun(): Int { return 0 }
+
+    when (value_1) {
+        1 -> fun() {}
+        2 -> fun(): Int { return 1 }
+        3 -> fun(): () -> Unit { return fun() {} }
+        4 -> fun_1
+    }
+}
+
+// TESTCASE NUMBER: 19
+fun case_19(value_1: Int): Any {
+    val lambda_1 = { 0 }
+
+    return when (value_1) {
+        1 -> lambda_1
+        2 -> { { {} } }
+        else -> { -> (Int)
+            { arg: Int -> { { println(arg) } } }
+        }
+    }
+}
+
+// TESTCASE NUMBER: 20
+fun case_20(value_1: Int) {
+    val object_1 = object {
+        val prop_1 = 1
+    }
+
+    when (value_1) {
+        1 -> object {}
+        2 -> object {
+            private fun fun_1() { }
+            val prop_1 = 1
+        }
+        3 -> object_1
+    }
+}
+
+// TESTCASE NUMBER: 21
+class A {
+    val prop_1 = 1
+    val lambda_1 = { 1 }
+    fun fun_1(): Int { return 1 }
+
+    fun case_21(value_1: Int) {
+        when (value_1) {
+            1 -> this
+            2 -> ((this))
+            3 -> this::prop_1.get()
+            4 -> this.prop_1
+            5 -> this.lambda_1()
+            6 -> this::lambda_1.get()()
+            7 -> this.fun_1()
+            8 -> this::fun_1.invoke()
+        }
+    }
+}
+
+// TESTCASE NUMBER: 22
+fun case_22(value_1: Int) {
+    when (value_1) {
+        1 -> throw Exception()
+        2 -> throw throw throw Exception()
+    }
+}
+
+// TESTCASE NUMBER: 23
+fun case_23(value_1: Int) {
+    fun r_1() {
+        when (value_1) {
+            1 -> return
+            2 -> <!UNREACHABLE_CODE!>return return<!> return
+        }
+    }
+
+    fun r_2(): List<Int>? {
+        when (value_1) {
+            1 -> return listOf(0, 1, 2)
+            2 -> return null
+        }
+
+        return null
+    }
+}
+
+// TESTCASE NUMBER: 24
+fun case_24(value_1: Int) {
+    loop1@ while (true) {
+        loop2@ while (true) {
+            when (value_1) {
+                1 -> continue@loop1
+                2 -> continue@loop2
+            }
+        }
+    }
+}
+
+// TESTCASE NUMBER: 25
+fun case_25(value_1: Int) {
+    loop1@ while (true) {
+        loop2@ while (true) {
+            when (value_1) {
+                1 -> break@loop1
+                2 -> break@loop2
+            }
+        }
+    }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.1.kt
index af62f72dec1..42a04d5b7a3 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.1.kt
@@ -3,32 +3,36 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: 'When' with bound value and not allowed break and continue expression (without labels) in the control structure body.
+ * DESCRIPTION: 'When' with bound value and type test condition (without companion object in classes), but without type checking operator.
+ * HELPERS: classes
  */
 
 // TESTCASE NUMBER: 1
-fun case_1(value_1: Int): Int {
-    while (true) {
-        when (value_1) {
-            1 -> return 1
-            2 -> <!BREAK_OR_CONTINUE_IN_WHEN!>break<!>
-        }
+fun case_1(value_1: Any): String {
+    when (value_1) {
+        <!NO_COMPANION_OBJECT!>EmptyClass<!> -> return ""
     }
 
-    return 0
+    return ""
 }
 
 // TESTCASE NUMBER: 2
-fun case_2(value_1: Int): Int {
-    while (true) {
-        when (value_1) {
-            1 -> <!BREAK_OR_CONTINUE_IN_WHEN!>continue<!>
-            2 -> return 1
-        }
+fun case_2(value_1: Any): String {
+    when (value_1) {
+        <!NO_COMPANION_OBJECT!>Any<!> -> return ""
     }
 
-    <!UNREACHABLE_CODE!>return 0<!>
+    return ""
+}
+
+// TESTCASE NUMBER: 3
+fun case_3(value_1: Any): String {
+    when (value_1) {
+        <!NO_COMPANION_OBJECT!>Nothing<!> -> return ""
+    }
+
+    return ""
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.2.kt
similarity index 82%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.2.kt
index 7fc4ad0a059..f0cf1b4a7e1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/1.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and type test condition on the non-type operand of the type checking operator.
  * HELPERS: classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/11.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/11.1.kt
new file mode 100644
index 00000000000..29ebb91f885
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/11.1.kt
@@ -0,0 +1,33 @@
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
+ *
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 11
+ * NUMBER: 1
+ * DESCRIPTION: 'When' without bound value and with 'else' branch not in the last position.
+ */
+
+// TESTCASE NUMBER: 1
+fun case_1(<!UNUSED_PARAMETER!>value_1<!>: Int): String = when {
+    <!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
+    <!UNREACHABLE_CODE!>value_1 == 1 -> ""<!>
+}
+
+// TESTCASE NUMBER: 2
+fun case_2(value_1: Int): String = when {
+    value_1 == 1 -> ""
+    <!ELSE_MISPLACED_IN_WHEN!>else<!> -> ""
+    <!UNREACHABLE_CODE!>value_1 == 2 -> ""<!>
+}
+
+// TESTCASE NUMBER: 3
+fun case_3(): String {
+    when {
+        <!ELSE_MISPLACED_IN_WHEN!>else<!> -> return ""
+        <!UNREACHABLE_CODE!>else -> return ""<!>
+    }
+
+    <!UNREACHABLE_CODE!>return ""<!>
+}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.1.kt
similarity index 84%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.1.kt
index 1aaac4c87a8..fd825c1e84a 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and 'when condition' with range expression, but without containment checking operator.
  * HELPERS: typesProvider
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
similarity index 92%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
index 24889268703..c538d9f6abc 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/3.2.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and 'when condition' with contains operator and type without defined contains operator.
  * HELPERS: classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/6.1.kt
similarity index 88%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/7.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/6.1.kt
index 4143633f708..43d9d108b62 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/6.1.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 7
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and with else branch not in the last position.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.1.kt
similarity index 89%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.1.kt
index 41b74dae3de..60519fdb17b 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.1.kt
@@ -4,8 +4,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 5
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 9
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and non-expressions in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.2.kt
similarity index 88%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.2.kt
index 3d4b642a5c6..3690ac3da2f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/5.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/neg/9.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 5
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 9
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and not allowed break and continue expression (without labels) in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.1.kt
index d9e3134c086..4bd35a4fdd9 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.1.kt
@@ -1,322 +1,69 @@
-// !DIAGNOSTICS: -UNUSED_EXPRESSION
 // SKIP_TXT
 
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
+ * SPEC VERSION: 0.1-100
  * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
- * DESCRIPTION: 'When' with bound value and with different variants of expressions in the control structure body.
- * HELPERS: typesProvider, classes, functions
+ * DESCRIPTION: 'When' with bound value and type test condition.
+ * HELPERS: classes, objects
  */
 
 // TESTCASE NUMBER: 1
-fun case_1(value_1: Int) {
+fun case_1(value_1: Any): String {
     when (value_1) {
-        1 -> true
-        2 -> 100
-        3 -> -.09f
-        4 -> '.'
-        5 -> "..."
-        6 -> null
+        is Int -> return ""
+        is Float -> return ""
+        is Double -> return ""
+        is String -> return ""
+        is Char -> return ""
+        is Boolean -> return ""
     }
+
+    return ""
 }
 
 // TESTCASE NUMBER: 2
-fun case_2(value_1: Int, value_2: Byte, value_3: TypesProvider) {
-    when (value_1) {
-        1 -> -.09 % 10L
-        3 -> value_2 / -5
-        2 -> value_3.getChar() - 11 + 90
-        4 -> 100
-    }
+fun case_2(value_1: Any?): String = when (value_1) {
+    is Int? -> "" // if value is null then this branch will be executed
+    is Float -> ""
+    else -> ""
 }
 
 // TESTCASE NUMBER: 3
-fun case_3(value_1: Int, value_2: Boolean, value_3: Long) {
-    when (value_1) {
-        1 -> value_2
-        2 -> !value_2
-        3 -> getBoolean() && value_2
-        5 -> getChar() != 'a'
-        6 -> getList() === getAny()
-        7 -> value_3 <= 11
-    }
+fun case_3(value_1: Any?): String = when (value_1) {
+    is Any -> ""
+    else -> ""
 }
 
 // TESTCASE NUMBER: 4
-fun case_4(value_1: Int, value_2: String, value_3: String) {
-    when (value_1) {
-        1 -> "..." + value_2 + "" + "$value_3" + "..."
-        2 -> value_2 + getString()
-    }
+fun case_4(value_1: Any): String = when (value_1) {
+    <!USELESS_IS_CHECK!>is Any<!USELESS_NULLABLE_CHECK!>?<!><!> -> ""
+    else -> ""
 }
 
-// TESTCASE NUMBER: 5
-fun case_5(value_1: Int, value_2: Int, value_3: Boolean?) {
-    when (value_1) {
-        1 -> when (value_3) {
-            value_2 > 1000 -> "1"
-            value_2 > 100 -> "2"
-            else -> "3"
-        }
-        2 -> when (value_3) {
-            value_2 > 1000 -> "1"
-            value_2 > 100 -> "2"
-        }
-        3 -> when (value_3) {}
-        4 -> when (value_3) {
-            true -> "1"
-            false -> "2"
-            null -> "3"
-        }
-        5 -> when (value_3) {
-            true -> "1"
-            false -> "2"
-        }
-        6 -> when (value_3) {}
-    }
+/*
+ * TESTCASE NUMBER: 5
+ * UNEXPECTED BEHAVIOUR
+ * ISSUES: KT-22996
+ */
+fun case_5(value_1: Any?): String = when (value_1) {
+    is Double -> ""
+    is Int? -> "" // if value is null then this branch will be executed
+    is String -> ""
+    is Float? -> "" // redundant nullable type check
+    is Char -> ""
+    is Boolean -> ""
+    else -> ""
 }
 
 // TESTCASE NUMBER: 6
-fun case_6(value_1: Int, value_2: Int, value_3: Boolean?) = when (value_1) {
-    1 -> when (value_3) {
-        value_2 > 1000 -> 1
-        value_2 > 100 -> 2
-        else -> 3
-    }
-    else -> when (value_3) {
-        true -> 1
-        false -> 2
-        null -> 3
-    }
-}
-
-// TESTCASE NUMBER: 7
-fun case_7(value_1: Int, value_2: Int, value_3: Boolean?) {
+fun case_6(value_1: Any): String {
     when (value_1) {
-        1 -> if (value_2 > 1000) "1"
-        2 -> if (value_2 > 1000) "1"
-            else "2"
-        3 -> if (value_2 < 100) "1"
-            else if (value_2 < 10) "2"
-            else "4"
-        4 -> if (value_3 == null) "1"
-            else if (<!DEBUG_INFO_SMARTCAST!>value_3<!>) "2"
-            else if (!<!DEBUG_INFO_SMARTCAST!>value_3<!>) "3"
-    }
-}
-
-// TESTCASE NUMBER: 8
-fun case_8(value_1: Int, value_2: Int) = when (value_1) {
-    1 -> if (value_2 > 1000) "1"
-    else "2"
-    else -> if (value_2 < 100) "1"
-    else if (value_2 < 10) "2"
-    else "4"
-}
-
-// TESTCASE NUMBER: 9
-fun case_9(value_1: Int, value_2: String, value_3: String): Any {
-    return when (value_1) {
-        1 -> try { 4 } catch (e: Exception) { 5 }
-        2 -> try { throw Exception() } catch (e: Exception) { value_2 }
-        else -> try { throw Exception() } catch (e: Exception) { {value_3} } finally { }
-    }
-}
-
-// TESTCASE NUMBER: 10
-fun case_10(value_1: Int, value_2: String?, value_3: String?) {
-    when (value_1) {
-        1 -> value_2 ?: true
-        2 -> value_2 ?: value_3 ?: true
-        3 -> value_2!! <!USELESS_ELVIS!>?: true<!>
-    }
-}
-
-// TESTCASE NUMBER: 11
-fun case_11(value_1: Int) {
-    when (value_1) {
-        1 -> 1..10
-        2 -> -100L..100L
-        3 -> -getInt()..getLong()
-    }
-}
-
-// TESTCASE NUMBER: 12
-fun case_12(value_1: Int, value_2: Collection<Int>, value_3: Collection<Int>?) {
-    when (value_1) {
-        1 -> value_2 as List<Int>
-        2 -> value_2 as? List<Int>
-        3 -> value_3 <!UNCHECKED_CAST!>as? MutableMap<Int, Int><!>
-        4 -> (value_2 <!UNCHECKED_CAST!>as? Map<Int, Int><!>) as MutableMap<Int, Int>
-    }
-}
-
-// TESTCASE NUMBER: 13
-fun case_13(value_1: Int, value_2: Int, value_3: Int, value_4: Boolean) {
-    var mutableValue1 = value_2
-    var mutableValue2 = value_3
-
-    when (value_1) {
-        1 -> ++mutableValue1
-        2 -> --mutableValue2
-        3 -> !value_4
-    }
-}
-
-// TESTCASE NUMBER: 14
-fun case_14(value_1: Int, value_2: Int, value_3: Int, value_4: Boolean?) {
-    var mutableValue1 = value_2
-    var mutableValue2 = value_3
-
-    when (value_1) {
-        1 -> <!UNUSED_CHANGED_VALUE!>mutableValue1++<!>
-        2 -> <!UNUSED_CHANGED_VALUE!>mutableValue2--<!>
-        3 -> value_4!!
-    }
-}
-
-// TESTCASE NUMBER: 15
-fun case_15(value_1: Int, value_2: List<Int>, value_3: List<List<List<List<Int>>>>) {
-    when (value_1) {
-        1 -> value_2[0]
-        2 -> value_3[0][-4][1][-1]
-    }
-}
-
-// TESTCASE NUMBER: 16
-fun case_16(value_1: Int, value_2: Class, value_3: Class?, value_4: Int) {
-    fun __fun_1(): () -> Unit { return fun() { } }
-
-    when (value_1) {
-        1 -> funWithoutArgs()
-        2 -> __fun_1()()
-        3 -> value_2.fun_2(value_4)
-        4 -> value_3?.fun_2(value_4)
-        5 -> value_3!!.fun_2(value_4)
-    }
-}
-
-// TESTCASE NUMBER: 17
-fun case_17(value_1: Int, value_2: Class, value_3: Class?) {
-    when (value_1) {
-        1 -> value_2.prop_1
-        2 -> value_3?.prop_1
-        3 -> value_2::prop_1.get()
-        4 -> value_3!!::prop_3.get()
-    }
-}
-
-// TESTCASE NUMBER: 18
-fun case_18(value_1: Int) {
-    val fun_1 = fun(): Int { return 0 }
-
-    when (value_1) {
-        1 -> fun() {}
-        2 -> fun(): Int { return 1 }
-        3 -> fun(): () -> Unit { return fun() {} }
-        4 -> fun_1
-    }
-}
-
-// TESTCASE NUMBER: 19
-fun case_19(value_1: Int): Any {
-    val lambda_1 = { 0 }
-
-    return when (value_1) {
-        1 -> lambda_1
-        2 -> { { {} } }
-        else -> { -> (Int)
-            { arg: Int -> { { println(arg) } } }
-        }
-    }
-}
-
-// TESTCASE NUMBER: 20
-fun case_20(value_1: Int) {
-    val object_1 = object {
-        val prop_1 = 1
-    }
-
-    when (value_1) {
-        1 -> object {}
-        2 -> object {
-            private fun fun_1() { }
-            val prop_1 = 1
-        }
-        3 -> object_1
-    }
-}
-
-// TESTCASE NUMBER: 21
-class A {
-    val prop_1 = 1
-    val lambda_1 = { 1 }
-    fun fun_1(): Int { return 1 }
-
-    fun case_21(value_1: Int) {
-        when (value_1) {
-            1 -> this
-            2 -> ((this))
-            3 -> this::prop_1.get()
-            4 -> this.prop_1
-            5 -> this.lambda_1()
-            6 -> this::lambda_1.get()()
-            7 -> this.fun_1()
-            8 -> this::fun_1.invoke()
-        }
-    }
-}
-
-// TESTCASE NUMBER: 22
-fun case_22(value_1: Int) {
-    when (value_1) {
-        1 -> throw Exception()
-        2 -> throw throw throw Exception()
-    }
-}
-
-// TESTCASE NUMBER: 23
-fun case_23(value_1: Int) {
-    fun r_1() {
-        when (value_1) {
-            1 -> return
-            2 -> <!UNREACHABLE_CODE!>return return<!> return
-        }
-    }
-
-    fun r_2(): List<Int>? {
-        when (value_1) {
-            1 -> return listOf(0, 1, 2)
-            2 -> return null
-        }
-
-        return null
-    }
-}
-
-// TESTCASE NUMBER: 24
-fun case_24(value_1: Int) {
-    loop1@ while (true) {
-        loop2@ while (true) {
-            when (value_1) {
-                1 -> continue@loop1
-                2 -> continue@loop2
-            }
-        }
-    }
-}
-
-// TESTCASE NUMBER: 25
-fun case_25(value_1: Int) {
-    loop1@ while (true) {
-        loop2@ while (true) {
-            when (value_1) {
-                1 -> break@loop1
-                2 -> break@loop2
-            }
-        }
+        is EmptyObject -> return ""
+        is ClassWithCompanionObject.Companion -> return ""
     }
+
+    return ""
 }
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.2.kt
similarity index 93%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.2.kt
index 9b153920795..f2da98e62d1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and type test condition (invert type checking operator).
  * HELPERS: classes, sealedClasses, objects
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.3.kt
similarity index 95%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.3.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.3.kt
index 17160bb6dc5..5fb4f0379a7 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.3.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' with bound value and enumaration of type test conditions.
  * HELPERS: classes, sealedClasses, objects
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.4.kt
similarity index 94%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.4.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.4.kt
index 0b9ff84b743..fd12bd5e66d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.4.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/1.4.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: 'When' with bound value and enumaration of type test conditions (with invert type checking operator).
  * HELPERS: sealedClasses
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/11.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/11.1.kt
new file mode 100644
index 00000000000..8475aa9e457
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/11.1.kt
@@ -0,0 +1,26 @@
+// SKIP_TXT
+
+/*
+ * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
+ *
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 11
+ * NUMBER: 1
+ * DESCRIPTION: 'When' without bound value and with else branch in the last position.
+ */
+
+// TESTCASE NUMBER: 1
+fun case_1(value_1: Int): String {
+    when {
+        value_1 == 1 -> return ""
+        value_1 == 2 -> return ""
+        else -> return ""
+    }
+}
+
+// TESTCASE NUMBER: 2
+fun case_2(value_1: Int): String = when {
+    value_1 == 1 -> ""
+    value_1 == 2 -> ""
+    else -> ""
+}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.1.kt
similarity index 88%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.1.kt
index 792bec03029..b5a83c7b865 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and containment operator.
  * HELPERS: typesProvider, classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.2.kt
similarity index 87%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.2.kt
index bbdcaf742d7..f41134fd899 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/3.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/3.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and enumeration of the containment operators.
  * HELPERS: typesProvider, classes
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/7.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.kt
similarity index 85%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/7.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.kt
index c449e5698c5..f53d161965a 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/7.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 7
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 6
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and else branch.
  */
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.txt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.txt
new file mode 100644
index 00000000000..3e32b1afbe6
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/6.1.txt
@@ -0,0 +1,5 @@
+package
+
+public fun case_1(/*0*/ value_1: kotlin.Int?): kotlin.String
+public fun case_2(/*0*/ value_1: kotlin.Any): kotlin.String
+public fun case_3(/*0*/ value_1: kotlin.Int): kotlin.String
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.1.kt
similarity index 98%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.1.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.1.kt
index 26daed597ce..8804f19ed6f 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.1.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 5
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 9
  * NUMBER: 1
  * DESCRIPTION: 'When' with enumeration of the different variants of expressions in 'when condition'.
  * HELPERS: typesProvider, classes, functions
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.2.kt
similarity index 98%
rename from compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.2.kt
rename to compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.2.kt
index 1fe15a845f0..7ee25e1801d 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/5.2.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-6/pos/9.2.kt
@@ -3,8 +3,8 @@
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 5
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 9
  * NUMBER: 2
  * DESCRIPTION: 'When' with different variants of the arithmetic expressions (additive expression and multiplicative expression) in 'when condition'.
  * HELPERS: typesProvider, classes, functions
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.1.kt
deleted file mode 100644
index a2af8146578..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/neg/1.1.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
- * NUMBER: 1
- * DESCRIPTION: 'When' with bound value and type test condition (without companion object in classes), but without type checking operator.
- * HELPERS: classes
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Any): String {
-    when (value_1) {
-        <!NO_COMPANION_OBJECT!>EmptyClass<!> -> return ""
-    }
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Any): String {
-    when (value_1) {
-        <!NO_COMPANION_OBJECT!>Any<!> -> return ""
-    }
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: Any): String {
-    when (value_1) {
-        <!NO_COMPANION_OBJECT!>Nothing<!> -> return ""
-    }
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.1.kt
deleted file mode 100644
index af3df5a06fc..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-7/pos/1.1.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 7 -> sentence 1
- * NUMBER: 1
- * DESCRIPTION: 'When' with bound value and type test condition.
- * HELPERS: classes, objects
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Any): String {
-    when (value_1) {
-        is Int -> return ""
-        is Float -> return ""
-        is Double -> return ""
-        is String -> return ""
-        is Char -> return ""
-        is Boolean -> return ""
-    }
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Any?): String = when (value_1) {
-    is Int? -> "" // if value is null then this branch will be executed
-    is Float -> ""
-    else -> ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: Any?): String = when (value_1) {
-    is Any -> ""
-    else -> ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: Any): String = when (value_1) {
-    <!USELESS_IS_CHECK!>is Any<!USELESS_NULLABLE_CHECK!>?<!><!> -> ""
-    else -> ""
-}
-
-/*
- * TESTCASE NUMBER: 5
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-22996
- */
-fun case_5(value_1: Any?): String = when (value_1) {
-    is Double -> ""
-    is Int? -> "" // if value is null then this branch will be executed
-    is String -> ""
-    is Float? -> "" // redundant nullable type check
-    is Char -> ""
-    is Boolean -> ""
-    else -> ""
-}
-
-// TESTCASE NUMBER: 6
-fun case_6(value_1: Any): String {
-    when (value_1) {
-        is EmptyObject -> return ""
-        is ClassWithCompanionObject.Companion -> return ""
-    }
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.1.kt
deleted file mode 100644
index 70f5361e965..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.1.kt
+++ /dev/null
@@ -1,143 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 1
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via else branch).
- * HELPERS: classes, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> ClassLevel2()
-        value_1 > 0 && value_1 <= 10 -> ClassLevel3()
-        value_1 > 10 && value_1 <= 100 -> ClassLevel4()
-        else -> ClassLevel5()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> ClassLevel2()
-        1 -> ClassLevel3()
-        2 -> ClassLevel4()
-        else -> ClassLevel5()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1<!>
-        value_1 == 1 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1L<!>
-        value_1 == 2 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.122<!>
-        value_1 == 3 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.000f<!>
-        value_1 == 4 -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toShort()<!>
-        else -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toByte()<!>
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Long>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Double>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Float>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Short>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Byte>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Long>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Double>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Float>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Short>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Byte>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1<!>
-        1 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1L<!>
-        2 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.122<!>
-        3 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.000f<!>
-        4 -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toShort()<!>
-        else -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toByte()<!>
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Long>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Double>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Float>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Short>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Byte>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Long>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Double>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Float>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Short>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<Byte>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 5
-fun case_5(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        value_1 > 0 && value_1 <= 10 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        value_1 > 10 && value_1 <= 100 -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        else -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 6
-fun case_6(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        1 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        2 -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        else -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.2.kt
deleted file mode 100644
index 9fd5cc86d65..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.2.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 2
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via enum).
- * HELPERS: classes, enumClasses, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: EnumClass): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> ClassLevel2()
-        EnumClass.NORTH -> ClassLevel3()
-        EnumClass.SOUTH -> ClassLevel4()
-        EnumClass.WEST -> ClassLevel5()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: EnumClass?): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> ClassLevel2()
-        EnumClass.NORTH -> ClassLevel3()
-        EnumClass.SOUTH -> ClassLevel4()
-        EnumClass.WEST -> ClassLevel5()
-        null -> ClassLevel6()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel6>() }
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel6>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: EnumClass): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        EnumClass.NORTH -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        EnumClass.SOUTH -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        EnumClass.WEST -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: EnumClass?): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        EnumClass.NORTH -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        EnumClass.SOUTH -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        EnumClass.WEST -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> <!IMPLICIT_CAST_TO_ANY!>false<!>
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.3.kt
deleted file mode 100644
index 980b8c651db..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.3.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 3
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via boolean bound value).
- * HELPERS: classes, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Boolean): String {
-    val whenValue = when (value_1) {
-        true -> ClassLevel2()
-        false -> ClassLevel3()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Boolean?): String {
-    val whenValue = when (value_1) {
-        true -> ClassLevel2()
-        false -> ClassLevel3()
-        null -> ClassLevel4()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: Boolean): String {
-    val whenValue = when (value_1) {
-        true -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        false -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: Boolean?): String {
-    val whenValue = when (value_1) {
-        true -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        false -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        null -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-    }
-
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.4.kt
deleted file mode 100644
index 3c4c5b4527a..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/neg/1.4.kt
+++ /dev/null
@@ -1,173 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 4
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via sealed class).
- * HELPERS: classes, sealedClasses, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: SealedClass): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> ClassLevel2()
-        is SealedChild2 -> ClassLevel3()
-        is SealedChild3 -> ClassLevel4()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: SealedClass?): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> ClassLevel2()
-        is SealedChild2 -> ClassLevel3()
-        is SealedChild3 -> ClassLevel4()
-        null -> ClassLevel5()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: SealedClass): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        is SealedChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        is SealedChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: SealedClass?): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        is SealedChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        is SealedChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 5
-fun case_5(value_1: SealedClassWithObjects): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> ClassLevel2()
-        SealedWithObjectsChild2 -> ClassLevel3()
-        SealedWithObjectsChild3 -> ClassLevel4()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 6
-fun case_6(value_1: SealedClassWithObjects?): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> ClassLevel2()
-        SealedWithObjectsChild2 -> ClassLevel3()
-        SealedWithObjectsChild3 -> ClassLevel4()
-        null -> ClassLevel5()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 7
-fun case_7(value_1: SealedClassWithObjects): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        SealedWithObjectsChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        SealedWithObjectsChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 8
-fun case_8(value_1: SealedClassWithObjects?): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        SealedWithObjectsChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        SealedWithObjectsChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Int>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><String>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><() -> Unit>() }
-    checkSubtype<Int>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<String>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<() -> Unit>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 9
-fun case_9(value_1: SealedClassWithObjects?): String {
-    val whenValue = when (value_1) {
-        is SealedClassWithObjects -> ClassLevel2()
-        else -> ClassLevel3()
-    }
-
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel5>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel4>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel3>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><ClassLevel1>() }
-    checkSubtype<ClassLevel5>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel4>(<!TYPE_MISMATCH!>whenValue<!>)
-    checkSubtype<ClassLevel3>(<!TYPE_MISMATCH!>whenValue<!>)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.1.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.1.kt
deleted file mode 100644
index c5ac82d3864..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.1.kt
+++ /dev/null
@@ -1,115 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 1
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via else branch).
- * HELPERS: classes, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> ClassLevel2()
-        value_1 > 0 && value_1 <= 10 -> ClassLevel3()
-        value_1 > 10 && value_1 <= 100 -> ClassLevel4()
-        else -> ClassLevel5()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> ClassLevel2()
-        1 -> ClassLevel3()
-        2 -> ClassLevel4()
-        else -> ClassLevel5()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-/*
- * TESTCASE NUMBER: 3
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-25268
- */
-fun case_3(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1<!>
-        value_1 == 1 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1L<!>
-        value_1 == 2 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.122<!>
-        value_1 == 3 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.000f<!>
-        value_1 == 4 -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toShort()<!>
-        else -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toShort()<!>
-    }
-
-    whenValue checkType { check<Any>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Number>() } // unexpected behaviour!
-    checkSubtype<Number>(<!TYPE_MISMATCH!>whenValue<!>) // unexpected behaviour!
-
-    return ""
-}
-
-/*
- * TESTCASE NUMBER: 4
- * UNEXPECTED BEHAVIOUR
- * ISSUES: KT-25268
- */
-fun case_4(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1<!>
-        1 -> <!IMPLICIT_CAST_TO_ANY!>1 + 1L<!>
-        2 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.122<!>
-        3 -> <!IMPLICIT_CAST_TO_ANY!>1 + -.000f<!>
-        4 -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toShort()<!>
-        else -> <!IMPLICIT_CAST_TO_ANY!>1 + 10.toByte()<!>
-    }
-
-    whenValue checkType { check<Any>() }
-    whenValue checkType { <!TYPE_MISMATCH!>check<!><Number>() } // unexpected behaviour!
-    checkSubtype<Number>(<!TYPE_MISMATCH!>whenValue<!>) // unexpected behaviour!
-
-    return ""
-}
-
-// TESTCASE NUMBER: 5
-fun case_5(value_1: Int): String {
-    val whenValue = when {
-        value_1 == 0 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        value_1 > 0 && value_1 <= 10 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        value_1 > 10 && value_1 <= 100 -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        else -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 6
-fun case_6(value_1: Int): String {
-    val whenValue = when (value_1) {
-        0 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        1 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        2 -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        else -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.2.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.2.kt
deleted file mode 100644
index c104b11d621..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.2.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 2
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via enum).
- * HELPERS: classes, enumClasses, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: EnumClass): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> ClassLevel2()
-        EnumClass.NORTH -> ClassLevel3()
-        EnumClass.SOUTH -> ClassLevel4()
-        EnumClass.WEST -> ClassLevel5()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: EnumClass?): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> ClassLevel2()
-        EnumClass.NORTH -> ClassLevel3()
-        EnumClass.SOUTH -> ClassLevel4()
-        EnumClass.WEST -> ClassLevel5()
-        null -> ClassLevel6()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: EnumClass): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        EnumClass.NORTH -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        EnumClass.SOUTH -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        EnumClass.WEST -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: EnumClass?): String {
-    val whenValue = when (value_1) {
-        EnumClass.EAST -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        EnumClass.NORTH -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        EnumClass.SOUTH -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        EnumClass.WEST -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> <!IMPLICIT_CAST_TO_ANY!>false<!>
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.3.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.3.kt
deleted file mode 100644
index 225328ce9d0..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.3.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 3
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via boolean bound value).
- * HELPERS: classes, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: Boolean): String {
-    val whenValue = when (value_1) {
-        true -> ClassLevel2()
-        false -> ClassLevel3()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: Boolean?): String {
-    val whenValue = when (value_1) {
-        true -> ClassLevel2()
-        false -> ClassLevel3()
-        null -> ClassLevel4()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: Boolean): String {
-    val whenValue = when (value_1) {
-        true -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        false -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: Boolean?): String {
-    val whenValue = when (value_1) {
-        true -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        false -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-        null -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.4.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.4.kt
deleted file mode 100644
index 6ec103f22f2..00000000000
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/p-9/pos/1.4.kt
+++ /dev/null
@@ -1,139 +0,0 @@
-// SKIP_TXT
-
-/*
- * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: expressions, when-expression -> paragraph 9 -> sentence 1
- * NUMBER: 4
- * DESCRIPTION: 'When' least upper bound of the types check (when exhaustive via sealed class).
- * HELPERS: classes, sealedClasses, checkType
- */
-
-// TESTCASE NUMBER: 1
-fun case_1(value_1: SealedClass): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> ClassLevel2()
-        is SealedChild2 -> ClassLevel3()
-        is SealedChild3 -> ClassLevel4()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 2
-fun case_2(value_1: SealedClass?): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> ClassLevel2()
-        is SealedChild2 -> ClassLevel3()
-        is SealedChild3 -> ClassLevel4()
-        null -> ClassLevel5()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 3
-fun case_3(value_1: SealedClass): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        is SealedChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        is SealedChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 4
-fun case_4(value_1: SealedClass?): String {
-    val whenValue = when (value_1) {
-        is SealedChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        is SealedChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        is SealedChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 5
-fun case_5(value_1: SealedClassWithObjects): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> ClassLevel2()
-        SealedWithObjectsChild2 -> ClassLevel3()
-        SealedWithObjectsChild3 -> ClassLevel4()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 6
-fun case_6(value_1: SealedClassWithObjects?): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> ClassLevel2()
-        SealedWithObjectsChild2 -> ClassLevel3()
-        SealedWithObjectsChild3 -> ClassLevel4()
-        null -> ClassLevel5()
-    }
-
-    whenValue checkType { check<ClassLevel2>() }
-    checkSubtype<ClassLevel1>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 7
-fun case_7(value_1: SealedClassWithObjects): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        SealedWithObjectsChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        SealedWithObjectsChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 8
-fun case_8(value_1: SealedClassWithObjects?): String {
-    val whenValue = when (value_1) {
-        SealedWithObjectsChild1 -> <!IMPLICIT_CAST_TO_ANY!>10<!>
-        SealedWithObjectsChild2 -> <!IMPLICIT_CAST_TO_ANY!>""<!>
-        SealedWithObjectsChild3 -> <!IMPLICIT_CAST_TO_ANY!>object<!> {}
-        null -> {<!IMPLICIT_CAST_TO_ANY!>{}<!>}
-    }
-
-    whenValue checkType { check<Any>() }
-    checkSubtype<Any>(whenValue)
-
-    return ""
-}
-
-// TESTCASE NUMBER: 9
-fun case_9(value_1: SealedClassWithObjects): String {
-    val whenValue = when (value_1) {
-        <!USELESS_IS_CHECK!>is SealedClassWithObjects<!> -> 10
-    }
-
-    whenValue checkType { check<Int>() }
-    checkSubtype<Int>(whenValue)
-
-    return ""
-}
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json
new file mode 100644
index 00000000000..112a264ee91
--- /dev/null
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/when-expression/testsMap.json
@@ -0,0 +1,232 @@
+{
+  "6": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "\u0027When\u0027 with bound value and type test condition on the non-type operand of the type checking operator.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "\u0027When\u0027 with bound value and type test condition (without companion object in classes), but without type checking operator.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with range expression, but without containment checking operator.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with contains operator and type without defined contains operator.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "9": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and non-expressions in \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and not allowed break and continue expression (without labels) in \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "6": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "\u0027When\u0027 with bound value and with else branch not in the last position.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "11": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "\u0027When\u0027 without bound value and with \u0027else\u0027 branch not in the last position.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 5,
+          "description": "\u0027When\u0027 with bound value and type test condition (invert type checking operator).",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "\u0027When\u0027 with bound value and enumaration of type test conditions.",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 7,
+          "description": "\u0027When\u0027 with bound value and enumaration of type test conditions (with invert type checking operator).",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "\u0027When\u0027 with bound value and type test condition.",
+          "unexpectedBehaviour": true
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and containment operator.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and enumeration of the containment operators.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "9": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 23,
+          "description": "\u0027When\u0027 with enumeration of the different variants of expressions in \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 26,
+          "description": "\u0027When\u0027 with different variants of the arithmetic expressions (additive expression and multiplicative expression) in \u0027when condition\u0027.",
+          "unexpectedBehaviour": true
+        }
+      ],
+      "6": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 3,
+          "description": "\u0027When\u0027 with bound value and else branch.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "11": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 without bound value and with else branch in the last position.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "1": {
+    "pos": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Empty when with bound value.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "Empty when without bound value.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "When with non-boolean value in the when condition.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 1,
+          "description": "When without bound value, forbidden comma in the when condition.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "Forbidden break and continue in the control structure body of when.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 9,
+          "description": "When without bound value, various boolean values in the when condition.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 6,
+          "description": "\u0027When\u0027 without bound value and with Nothing in condition (subtype of Boolean).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 without bound value and only one \u0027else\u0027 branch.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 25,
+          "description": "When without bound value, various expressions in the control structure body.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "5": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 2,
+          "description": "\u0027When\u0027 with bound value and not allowed break and continue expression (without labels) in the control structure body.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 25,
+          "description": "\u0027When\u0027 with bound value and with different variants of expressions in the control structure body.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.1.kt b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.1.kt
index db53caf5d3c..6b87015e592 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.1.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.1.kt
@@ -56,14 +56,14 @@ fun case_8() {
 // TESTCASE NUMBER: 9
 fun case_9() {
     val x = null
-    val y: Int = <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    val y: Int = <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>
 }
 
 // TESTCASE NUMBER: 10
 fun case_10(x: Int?) {
     var y = 10
-    y = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    y = <!TYPE_MISMATCH!>x<!>
 }
 
 // TESTCASE NUMBER: 11
-fun case_11(x: Int?, y: Int = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>) = null
\ No newline at end of file
+fun case_11(x: Int?, y: Int = <!TYPE_MISMATCH!>x<!>) = null
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.3.kt b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.3.kt
index ae76ba69a17..c44024c704c 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.3.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/type-system/introduction-1/p-6/neg/2.3.kt
@@ -34,6 +34,6 @@ fun <T> case_4() {
 // TESTCASE NUMBER: 5
 fun <T, K> case_5(x: T) where T: Number?, K: Number {
     if (x == null) {
-        class Case5 constructor(y: K = <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH, TYPE_MISMATCH!>x<!>)
+        class Case5 constructor(y: K = <!DEBUG_INFO_CONSTANT, TYPE_MISMATCH!>x<!>)
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt
index fdbad6d3278..dcbe4462eee 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/1.kt
@@ -265,14 +265,14 @@ fun case_16() {
 
     if (<!DEBUG_INFO_CONSTANT!>x<!> != <!USELESS_IS_CHECK!><!USELESS_IS_CHECK!><!USELESS_IS_CHECK!><!USELESS_IS_CHECK!>null !is Boolean !is Boolean<!> !is Boolean<!> !is Boolean<!> !is Boolean<!>) {
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableNothing /* = kotlin.Nothing? */")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableNothing /* = kotlin.Nothing? */")!>x<!><!UNSAFE_CALL!>.<!>java
+        <!DEBUG_INFO_EXPRESSION_TYPE("TypealiasNullableNothing /* = kotlin.Nothing? */")!>x<!><!UNSAFE_CALL!>.<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>java<!>
     }
 }
 
 // TESTCASE NUMBER: 17
 val case_17 = if (nullableIntProperty == null == true == false) 0 else {
     <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing?")!>nullableIntProperty<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing?")!>nullableIntProperty<!><!UNSAFE_CALL!>.<!>java
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing?")!>nullableIntProperty<!><!UNSAFE_CALL!>.<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>java<!>
 }
 
 //TESTCASE NUMBER: 18
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/22.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/22.kt
index 9380c05fd39..8ba4aa6e9cf 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/22.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/22.kt
@@ -74,7 +74,7 @@ fun case_4(x: Boolean?, y: Boolean?) {
 // TESTCASE NUMBER: 5
 fun case_5(x: Boolean?, y: Boolean?) {
     while (true) {
-        y.<!UNREACHABLE_CODE!><!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>to<!>(<!>break<!UNREACHABLE_CODE!>)<!>
+        y.<!UNREACHABLE_CODE!>to(<!>break<!UNREACHABLE_CODE!>)<!>
         <!UNREACHABLE_CODE!>x!!<!>
     }
 
@@ -176,7 +176,7 @@ fun case_12(x: Int?) {
 
     val y: Int
     while (true) {
-        <!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>break<!UNREACHABLE_CODE!>[x!!]<!><!>
+        <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>break<!UNREACHABLE_CODE!>[x!!]<!><!>
     }
 
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.kt
index 8fc9a1f31a5..e6af9badd71 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/30.kt
@@ -15,28 +15,28 @@
 // TESTCASE NUMBER: 1
 class Case1(val x: Any?) {
     val y = x!!
-    val z: Any = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    val z: Any = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH!>x<!>
 }
 
 // TESTCASE NUMBER: 2
 class Case2(val y: Any?): ClassWithCostructorParam(y!!) {
-    val z: Any = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH, TYPE_MISMATCH!>y<!>
+    val z: Any = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH!>y<!>
 }
 
 // TESTCASE NUMBER: 3
 class Case3(val y: Any?): ClassWithCostructorParam(y as Class) {
-    val z: Class = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH, TYPE_MISMATCH!>y<!>
+    val z: Class = <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), TYPE_MISMATCH!>y<!>
 }
 
 // TESTCASE NUMBER: 4
 class Case4(val y: Any?): ClassWithCostructorParam(y!!) {
     init {
-        val z: Any = <!TYPE_MISMATCH, TYPE_MISMATCH!>y<!>
+        val z: Any = <!TYPE_MISMATCH!>y<!>
     }
 }
 
 // TESTCASE NUMBER: 5
-class Case5(val y: Any?): ClassWithCostructorParam(y as Interface1), Interface1 by <!TYPE_MISMATCH, TYPE_MISMATCH!>y<!> {}
+class Case5(val y: Any?): ClassWithCostructorParam(y as Interface1), Interface1 by <!TYPE_MISMATCH!>y<!> {}
 
 // TESTCASE NUMBER: 6
 fun case_6(a: Int?) = object : ClassWithCostructorParam(a!!) {
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
index 0acc3cf23e4..c17b97b8b40 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/32.kt
@@ -46,8 +46,8 @@ fun case_2(x: Int?, y: Nothing?) {
 fun case_3(x: Int?) {
     if (x == null) {
         <!ALWAYS_NULL!>x<!> as Int
-        stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!>)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing")!>x<!>
+        <!UNREACHABLE_CODE!>stringArg(<!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!><!UNREACHABLE_CODE!>)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), UNREACHABLE_CODE!>x<!>
     }
 }
 
@@ -59,7 +59,7 @@ fun case_3(x: Int?) {
 fun case_4(x: Int?) {
     if (x == null) {
         <!ALWAYS_NULL!>x<!>!!
-        <!UNREACHABLE_CODE!>stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!>)<!>
+        <!UNREACHABLE_CODE!>stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!>)<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), UNREACHABLE_CODE!>x<!>
     }
 }
@@ -73,7 +73,7 @@ fun case_5(x: Int?) {
     if (x == null) {
         var y = <!DEBUG_INFO_CONSTANT!>x<!>
         <!ALWAYS_NULL!>y<!>!!
-        <!UNREACHABLE_CODE!>stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>y<!>)<!>
+        <!UNREACHABLE_CODE!>stringArg(<!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>y<!>)<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int? & kotlin.Nothing"), UNREACHABLE_CODE!>y<!>
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/40.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/40.kt
index 2418b50f237..343ca2a464a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/40.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/40.kt
@@ -18,7 +18,7 @@
 fun case_1(x: Pair<*, *>) {
     if (x.first !is String) return
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x.first<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x.first<!>.<!UNRESOLVED_REFERENCE!>length<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), SMARTCAST_IMPOSSIBLE!>x.first<!>.length
 }
 
 /*
@@ -28,5 +28,5 @@ fun case_1(x: Pair<*, *>) {
 fun case_2(x: Pair<*, *>) {
     if (x.first !is String?) throw Exception()
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x.first<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x.first<!>?.<!UNRESOLVED_REFERENCE!>length<!>
-}
\ No newline at end of file
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?"), SMARTCAST_IMPOSSIBLE!>x.first<!>?.length
+}
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/43.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/43.kt
index d27d635747f..c828ce9f5a4 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/43.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/43.kt
@@ -23,7 +23,7 @@ fun case_1(x: Double?, y: Double?) : Double {
     } else if (x == null && y != null) {
         <!DEBUG_INFO_SMARTCAST!>y<!>
     } else {
-        x <!NONE_APPLICABLE!>+<!> y
+        x <!UNSAFE_OPERATOR_CALL!>+<!> <!TYPE_MISMATCH!>y<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/45.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/45.kt
index cd52f671e5c..11384270907 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/45.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/neg/45.kt
@@ -26,5 +26,5 @@ fun case_1(x: Number?): Long? {
  * ISSUES: KT-22997
  */
 fun case_2(x: Number?): Long? {
-    if (x == null || x is Long) return <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!> else return 0L
+    if (x == null || x is Long) return <!TYPE_MISMATCH!>x<!> else return 0L
 }
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.kt
index e6ccb7a8f21..9839fd0df46 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/1.kt
@@ -1304,13 +1304,9 @@ open class Case29(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         s = null
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>.hashCode()
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>this.s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>this.s<!>
     }
 
@@ -2352,13 +2348,9 @@ sealed class Case30(a: Int?, val b: Float?, private val c: Unit?, protected val
         s = null
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>.hashCode()
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>this.s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>this.s<!>
     }
 
@@ -3401,13 +3393,9 @@ enum class Case31(a: Int?, val b: Float?, private val c: Unit?, protected val d:
         s = null
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>.hashCode()
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>this.s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>this.s<!>
     }
 
@@ -4053,13 +4041,9 @@ object Case32 {
         s = null
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>.hashCode()
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing?")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>s<!>
-        if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>this.s<!>.java
         if (<!SENSELESS_COMPARISON!><!DEBUG_INFO_CONSTANT!>s<!> != null<!> || <!SENSELESS_COMPARISON!>this.s != null<!>) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Nothing")!>this.s<!>
     }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/11.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/11.kt
index b62a316d9fe..a55a2db28b4 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/11.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/11.kt
@@ -63,16 +63,16 @@ fun case_3(a: Int?, b: Float?, c: Double?, d: Boolean?) {
     }.apply {
         <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number} & {Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_SMARTCAST!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_SMARTCAST!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_SMARTCAST!>this<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number} & {Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number} & {Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.propNullableAny
             <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_SMARTCAST!>this<!>.funT()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number} & {Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}> & Number} & {Comparable<{Double & Float & Int}>? & Number?}"), DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>this<!>.funNullableAny()
         }
     }.let {
         <!DEBUG_INFO_EXPRESSION_TYPE("{Comparable<{Double & Float & Int}>? & Number?}")!>it<!>
@@ -106,16 +106,16 @@ fun case_4(a: Interface1?, b: Interface2?, c: Boolean) {
     x.apply {
         <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funT()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
         }
     }
     x.let {
@@ -149,16 +149,16 @@ fun case_5(a: Interface1?, b: Interface2?, d: Boolean) {
 
     x.apply {
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funT()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
         }
     }
     x.let {
@@ -191,18 +191,18 @@ fun case_6(a: Interface1?, b: Interface2, d: Boolean) {
 
     x.apply {
         this as Interface3
-        <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
         if (<!SENSELESS_COMPARISON!>this != null<!>) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funT()
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.itest1()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.itest2()
         }
@@ -241,18 +241,18 @@ fun case_7(a: Interface1?, b: Interface2?, d: Boolean) {
 
     x.apply {
         this as Interface3?
-        <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface3? & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.propNullableAny
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funT()
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface3"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & {Interface1 & Interface2} & {Interface1? & Interface2?}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.itest1()
             <!DEBUG_INFO_EXPRESSION_TYPE("{Interface1 & Interface2}"), DEBUG_INFO_EXPRESSION_TYPE("{Interface1? & Interface2?}"), DEBUG_INFO_SMARTCAST!>this<!>.itest2()
         }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt
index 6a0febc9e6c..564acffc41a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/12.kt
@@ -667,10 +667,10 @@ fun <T: Out<*>?> T.case_14() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>get()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.get()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>get<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -682,7 +682,7 @@ fun <T: Out<*>?> T.case_14() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>get<!>()
+            get()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -692,11 +692,11 @@ fun <T: Out<*>?> T.case_14() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>get()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>get()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -727,10 +727,10 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> T.case_15() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>itest1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.itest1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>itest1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>itest1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -742,7 +742,7 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> T.case_15() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>itest1<!>()
+            itest1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -752,11 +752,11 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> T.case_15() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -787,10 +787,10 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_16() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -802,7 +802,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_16() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -812,11 +812,11 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_16() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -847,10 +847,10 @@ fun <T: InterfaceWithTypeParameter1<in T>?> T.case_17() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -862,7 +862,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> T.case_17() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -872,11 +872,11 @@ fun <T: InterfaceWithTypeParameter1<in T>?> T.case_17() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -909,7 +909,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> T.case_18() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>y<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>y<!>.ip1test1()
 
         <!UNSAFE_CALL!>equals<!>(y)
         <!UNSAFE_CALL!>ip1test1<!>()
@@ -961,10 +961,10 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_19() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -976,7 +976,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_19() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -986,11 +986,11 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_19() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -1021,12 +1021,12 @@ fun <T> T.case_20() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test2()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
-        <!UNSAFE_CALL!>ip1test2<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test2<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -1038,8 +1038,8 @@ fun <T> T.case_20() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
-            <!UNSAFE_CALL!>ip1test2<!>()
+            ip1test1()
+            ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -1049,8 +1049,8 @@ fun <T> T.case_20() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test2()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -1063,8 +1063,8 @@ fun <T> T.case_20() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test2()
         }
     }
 }
@@ -1086,13 +1086,13 @@ fun <T> T.case_21() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test2()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test3()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
-        <!UNSAFE_CALL!>ip1test2<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test2<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test3<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
@@ -1105,8 +1105,8 @@ fun <T> T.case_21() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
-            <!UNSAFE_CALL!>ip1test2<!>()
+            ip1test1()
+            ip1test2()
             ip1test3()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
@@ -1117,8 +1117,8 @@ fun <T> T.case_21() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test3()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
@@ -1132,8 +1132,8 @@ fun <T> T.case_21() where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWit
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test3()
         }
     }
@@ -2864,11 +2864,11 @@ fun <T> T?.case_47() where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithTypePa
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -2881,7 +2881,7 @@ fun <T> T?.case_47() where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithTypePa
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -2892,7 +2892,7 @@ fun <T> T?.case_47() where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithTypePa
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -2906,19 +2906,19 @@ fun <T> T?.case_47() where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithTypePa
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
 
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!><!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
-        <!UNREACHABLE_CODE!><!UNSAFE_CALL!>compareTo<!>(return)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.<!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+        <!UNREACHABLE_CODE!><!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>compareTo<!>(return)<!>
 
         <!UNREACHABLE_CODE!><!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
-            <!UNREACHABLE_CODE!><!UNSAFE_CALL!>compareTo<!>(<!>return<!UNREACHABLE_CODE!>)<!>
-            <!UNREACHABLE_CODE!><!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>compareTo(return)<!>
+            <!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+            <!UNREACHABLE_CODE!><!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.compareTo(return)<!>
         }<!>
 
         <!UNREACHABLE_CODE!><!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!><!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.<!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
         }<!>
     }
 }
@@ -2941,11 +2941,11 @@ fun <T> T?.case_48() where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T>?
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -2958,7 +2958,7 @@ fun <T> T?.case_48() where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T>?
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -2969,7 +2969,7 @@ fun <T> T?.case_48() where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -2983,7 +2983,7 @@ fun <T> T?.case_48() where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3006,11 +3006,11 @@ fun <T> T?.case_49() where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>?
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3023,7 +3023,7 @@ fun <T> T?.case_49() where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>?
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3034,7 +3034,7 @@ fun <T> T?.case_49() where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3048,7 +3048,7 @@ fun <T> T?.case_49() where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3071,11 +3071,11 @@ fun <T> T?.case_50() where T : Inv<out T>, T: InterfaceWithTypeParameter1<out T>
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3088,7 +3088,7 @@ fun <T> T?.case_50() where T : Inv<out T>, T: InterfaceWithTypeParameter1<out T>
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3099,7 +3099,7 @@ fun <T> T?.case_50() where T : Inv<out T>, T: InterfaceWithTypeParameter1<out T>
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3113,7 +3113,7 @@ fun <T> T?.case_50() where T : Inv<out T>, T: InterfaceWithTypeParameter1<out T>
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3136,11 +3136,11 @@ fun <T> T?.case_51() where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>? {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3153,7 +3153,7 @@ fun <T> T?.case_51() where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>? {
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3164,7 +3164,7 @@ fun <T> T?.case_51() where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3178,7 +3178,7 @@ fun <T> T?.case_51() where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3262,11 +3262,11 @@ fun <T> T?.case_53() where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3279,7 +3279,7 @@ fun <T> T?.case_53() where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3290,7 +3290,7 @@ fun <T> T?.case_53() where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3304,7 +3304,7 @@ fun <T> T?.case_53() where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3327,11 +3327,11 @@ fun <T> T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>? {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.get()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>get<!>()
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3344,7 +3344,7 @@ fun <T> T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>? {
             funNullableT()
             funNullableAny()
             get()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3355,7 +3355,7 @@ fun <T> T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3369,7 +3369,7 @@ fun <T> T?.case_54() where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3650,14 +3650,14 @@ fun <T> T.case_59() where T: InterfaceWithFiveTypeParameters1<in T, *, out T?, N
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>itest1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>itest2()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>itest3()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.itest1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.itest2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.itest3()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>itest1<!>()
-        <!UNSAFE_CALL!>itest2<!>()
-        <!UNSAFE_CALL!>itest3<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>itest1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>itest2<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>itest3<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3669,9 +3669,9 @@ fun <T> T.case_59() where T: InterfaceWithFiveTypeParameters1<in T, *, out T?, N
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>itest1<!>()
-            <!UNSAFE_CALL!>itest2<!>()
-            <!UNSAFE_CALL!>itest3<!>()
+            itest1()
+            itest2()
+            itest3()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3681,9 +3681,9 @@ fun <T> T.case_59() where T: InterfaceWithFiveTypeParameters1<in T, *, out T?, N
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest2()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest3()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest3()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3696,9 +3696,9 @@ fun <T> T.case_59() where T: InterfaceWithFiveTypeParameters1<in T, *, out T?, N
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest2()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest3()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest3()
         }
     }
 }
@@ -3720,10 +3720,10 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_60() {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_EXPRESSION_TYPE("T")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T"), DEBUG_INFO_SMARTCAST!>this<!>.ip1test1()
 
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>equals<!>(this)
-        <!UNSAFE_CALL!>ip1test1<!>()
+        <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>ip1test1<!>()
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>apply<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3735,7 +3735,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_60() {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3745,7 +3745,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_60() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_IMPLICIT_RECEIVER_SMARTCAST!>also<!> {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3758,7 +3758,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> T.case_60() {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt
index 184a170fe40..25c56d0f0af 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/13.kt
@@ -768,7 +768,6 @@ fun <T> case_13(x: T) where T : Out<*>?, T: Comparable<T?> {
 
 /*
  * TESTCASE NUMBER: 14
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: Out<*>?> case_14(x: T) {
@@ -783,7 +782,7 @@ fun <T: Out<*>?> case_14(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>get()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.get()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -802,7 +801,7 @@ fun <T: Out<*>?> case_14(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>get()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.get()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -814,7 +813,7 @@ fun <T: Out<*>?> case_14(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>get<!>()
+            get()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -824,11 +823,11 @@ fun <T: Out<*>?> case_14(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>get()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.get()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>get()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.get()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -844,7 +843,6 @@ fun <T: Out<*>?> case_14(x: T) {
 
 /*
  * TESTCASE NUMBER: 15
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
@@ -859,7 +857,7 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>itest()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.itest()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -878,7 +876,7 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>itest()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.itest()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -890,7 +888,7 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>itest<!>()
+            itest()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -900,11 +898,11 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -920,7 +918,6 @@ fun <T: InterfaceWithFiveTypeParameters1<*, *, *, *, *>?> case_15(x: T) {
 
 /*
  * TESTCASE NUMBER: 16
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
@@ -935,7 +932,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -954,7 +951,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -966,7 +963,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -976,11 +973,11 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -996,7 +993,6 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_16(x: T) {
 
 /*
  * TESTCASE NUMBER: 17
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
@@ -1011,7 +1007,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -1030,7 +1026,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -1042,7 +1038,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -1052,11 +1048,11 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -1072,7 +1068,6 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_17(x: T) {
 
 /*
  * TESTCASE NUMBER: 18
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
@@ -1089,7 +1084,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>y<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>y<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>y<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -1108,7 +1103,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -1120,7 +1115,7 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -1130,11 +1125,11 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -1150,7 +1145,6 @@ fun <T: InterfaceWithTypeParameter1<in T>?> case_18(x: T) {
 
 /*
  * TESTCASE NUMBER: 19
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
@@ -1165,7 +1159,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -1184,7 +1178,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -1196,7 +1190,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -1206,11 +1200,11 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.propAny
@@ -1226,7 +1220,6 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_19(x: T) {
 
 /*
  * TESTCASE NUMBER: 20
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWithTypeParameter2<out T>? {
@@ -1241,8 +1234,8 @@ fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test2()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -1261,8 +1254,8 @@ fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
-        x<!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test2()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -1274,8 +1267,8 @@ fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
-            <!UNSAFE_CALL!>ip1test2<!>()
+            ip1test1()
+            ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -1285,8 +1278,8 @@ fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test2()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -1299,15 +1292,14 @@ fun <T> case_20(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test2()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 21
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceWithTypeParameter2<out T>?, T: InterfaceWithTypeParameter3<T>? {
@@ -1322,8 +1314,8 @@ fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test2()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test3()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
@@ -1343,8 +1335,8 @@ fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
-        x<!UNSAFE_CALL!>.<!>ip1test2()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test2()
         <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test3()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
@@ -1357,8 +1349,8 @@ fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
-            <!UNSAFE_CALL!>ip1test2<!>()
+            ip1test1()
+            ip1test2()
             ip1test3()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
@@ -1369,8 +1361,8 @@ fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test3()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
@@ -1384,8 +1376,8 @@ fun <T> case_21(x: T) where T: InterfaceWithTypeParameter1<in T>?, T: InterfaceW
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test2()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test3()
         }
     }
@@ -3196,7 +3188,6 @@ fun <T> case_46(x: T) where T : CharSequence?, T: Comparable<T>?, T: Iterable<*>
 
 /*
  * TESTCASE NUMBER: 47
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithTypeParameter1<out T>? {
@@ -3212,7 +3203,7 @@ fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithType
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3232,7 +3223,7 @@ fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithType
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3245,7 +3236,7 @@ fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithType
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3256,7 +3247,7 @@ fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithType
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3270,26 +3261,25 @@ fun <T> case_47(x: T?) where T : Inv<T>, T: Comparable<*>?, T: InterfaceWithType
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
 
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!><!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
-        <!UNREACHABLE_CODE!>x<!UNSAFE_CALL!>.<!>compareTo(return)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.<!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+        <!UNREACHABLE_CODE!><!DEBUG_INFO_SMARTCAST!>x<!>.compareTo(return)<!>
 
         <!UNREACHABLE_CODE!><!DEBUG_INFO_SMARTCAST!>x<!>.apply {
-            <!UNREACHABLE_CODE!><!UNSAFE_CALL!>compareTo<!>(<!>return<!UNREACHABLE_CODE!>)<!>
-            <!UNREACHABLE_CODE!><!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>compareTo(return)<!>
+            <!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+            <!UNREACHABLE_CODE!><!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.compareTo(return)<!>
         }<!>
 
         <!UNREACHABLE_CODE!><!DEBUG_INFO_SMARTCAST!>x<!>.also {
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!><!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.<!UNREACHABLE_CODE!>compareTo(<!>return<!UNREACHABLE_CODE!>)<!>
         }<!>
     }
 }
 
 /*
  * TESTCASE NUMBER: 48
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T>? {
@@ -3305,7 +3295,7 @@ fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3325,7 +3315,7 @@ fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3338,7 +3328,7 @@ fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3349,7 +3339,7 @@ fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3363,14 +3353,13 @@ fun <T> case_48(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<in T
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 49
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>? {
@@ -3386,7 +3375,7 @@ fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3406,7 +3395,7 @@ fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3419,7 +3408,7 @@ fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3430,7 +3419,7 @@ fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3444,14 +3433,13 @@ fun <T> case_49(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<in T>
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 50
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out T>? {
@@ -3467,7 +3455,7 @@ fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3487,7 +3475,7 @@ fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3500,7 +3488,7 @@ fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3511,7 +3499,7 @@ fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3525,14 +3513,13 @@ fun <T> case_50(x: T?) where T : Inv<out T>, T: InterfaceWithTypeParameter1<out
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 51
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>? {
@@ -3548,7 +3535,7 @@ fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>?
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3568,7 +3555,7 @@ fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>?
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3581,7 +3568,7 @@ fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>?
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3592,7 +3579,7 @@ fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3606,7 +3593,7 @@ fun <T> case_51(x: T?) where T : Inv<T>, T: InterfaceWithTypeParameter1<out T>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -3690,7 +3677,6 @@ fun <T> case_52(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<T>? {
 
 /*
  * TESTCASE NUMBER: 53
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
@@ -3706,7 +3692,7 @@ fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3726,7 +3712,7 @@ fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3739,7 +3725,7 @@ fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3750,7 +3736,7 @@ fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3764,14 +3750,13 @@ fun <T> case_53(x: T?) where T : Inv<in T>, T: InterfaceWithTypeParameter1<*>? {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 54
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>? {
@@ -3787,7 +3772,7 @@ fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>?
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!>.funNullableAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.test()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -3807,7 +3792,7 @@ fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>?
 
         x.funNullableAny()
         <!DEBUG_INFO_SMARTCAST!>x<!>.test()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -3820,7 +3805,7 @@ fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>?
             funNullableT()
             funNullableAny()
             test()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -3831,7 +3816,7 @@ fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -3845,7 +3830,7 @@ fun <T> case_54(x: T?) where T : Inv<*>, T: InterfaceWithTypeParameter1<out T?>?
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.test()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
@@ -4159,7 +4144,6 @@ fun <T : InterfaceWithTypeParameter1<InterfaceWithTypeParameter1<InterfaceWithTy
 
 /*
  * TESTCASE NUMBER: 59
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?, Nothing?, T>?, T: InterfaceWithFiveTypeParameters2<out T, in T?, T, *, Unit?>?, T: InterfaceWithFiveTypeParameters3<out Nothing, in T, T, in Int?, Number>? {
@@ -4174,9 +4158,9 @@ fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?,
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>itest1()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>itest2()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>itest3()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.itest1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.itest2()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.itest3()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -4195,9 +4179,9 @@ fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?,
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>itest1()
-        x<!UNSAFE_CALL!>.<!>itest2()
-        x<!UNSAFE_CALL!>.<!>itest3()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.itest1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.itest2()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.itest3()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -4209,9 +4193,9 @@ fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?,
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>itest1<!>()
-            <!UNSAFE_CALL!>itest2<!>()
-            <!UNSAFE_CALL!>itest3<!>()
+            itest1()
+            itest2()
+            itest3()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -4221,9 +4205,9 @@ fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?,
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest2()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>itest3()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.itest3()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -4236,16 +4220,15 @@ fun <T> case_59(x: T) where T: InterfaceWithFiveTypeParameters1<in T, *, out T?,
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest1()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest2()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>itest3()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest2()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.itest3()
         }
     }
 }
 
 /*
  * TESTCASE NUMBER: 60
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-28785
  */
 fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
@@ -4260,7 +4243,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.funAny()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!>.funNullableAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!")!>x<!><!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!!"), DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
 
         <!DEBUG_INFO_SMARTCAST!>x<!>.equals(null)
 
@@ -4279,7 +4262,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
         x.funNullableT()
 
         x.funNullableAny()
-        x<!UNSAFE_CALL!>.<!>ip1test1()
+        <!DEBUG_INFO_SMARTCAST!>x<!>.ip1test1()
         <!DEBUG_INFO_SMARTCAST!>x<!>.apply {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>
             equals(null)
@@ -4291,7 +4274,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
             funAny()
             funNullableT()
             funNullableAny()
-            <!UNSAFE_CALL!>ip1test1<!>()
+            ip1test1()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.equals(null)
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propT
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.propAny
@@ -4301,7 +4284,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T!!")!>this<!>.ip1test1()
         }
         <!DEBUG_INFO_SMARTCAST!>x<!>.also {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>
@@ -4314,7 +4297,7 @@ fun <T: InterfaceWithTypeParameter1<out T>?> case_60(x: T) {
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funAny()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableT()
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.funNullableAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!><!UNSAFE_CALL!>.<!>ip1test1()
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!!")!>it<!>.ip1test1()
         }
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt
index 70ed79e84da..cc73ab02acb 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/14.kt
@@ -22,7 +22,7 @@ fun case_1(vararg x: Int?) {
 fun case_2(vararg x: Int?) {
     x[0].apply {
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?"), DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?"), DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?"), DEBUG_INFO_SMARTCAST!>this<!>.inv()
         }
     }
@@ -47,7 +47,7 @@ fun <T> case_3(vararg x: T?) {
 fun <T : Number?> case_4(vararg x: T?) {
     x[0].apply {
         if (this != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("T!! & T?"), DEBUG_INFO_EXPRESSION_TYPE("T?")!>this<!>
             <!DEBUG_INFO_EXPRESSION_TYPE("T!!"), DEBUG_INFO_EXPRESSION_TYPE("T?"), DEBUG_INFO_SMARTCAST!>this<!>.toByte()
         }
     }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/15.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/15.kt
index fa271be4fb0..e5494c6369c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/15.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/15.kt
@@ -20,38 +20,19 @@ fun case_1() {
     val a = select(Case1_1(), Case1_2(), null)
 
     if (a != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>>?")!>a<!>
-        val b = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>>?")!>a<!>.ip1test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<*> & InterfaceWithTypeParameter1<*>?")!>a<!>
+        val b = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<*> & InterfaceWithTypeParameter1<*>?")!>a<!>.ip1test1()
         if (b != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>?")!>b<!>
-            val c = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>>?")!>b<!>.ip1test1()
-            if (c != null) {
-                <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>?")!>c<!>
-                val d = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>>?")!>c<!>.ip1test1()
-                if (d != null) {
-                    <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>?")!>d<!>
-                    val e = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>>?")!>d<!>.ip1test1()
-                    if (e != null) {
-                        <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>?")!>e<!>
-                        val f = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>> & InterfaceWithTypeParameter1<out InterfaceWithTypeParameter1<*>>?")!>e<!>.ip1test1()
-                        if (f != null) {
-                            <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<*> & InterfaceWithTypeParameter1<*>?")!>f<!>
-                            val g = <!DEBUG_INFO_EXPRESSION_TYPE("InterfaceWithTypeParameter1<*> & InterfaceWithTypeParameter1<*>?")!>f<!>.ip1test1()
-                            if (g != null) {
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>g<!>.equals(null)
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>g<!>.propT
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>g<!>.propAny
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>g<!>.propNullableT
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>g<!>.propNullableAny
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>g<!>.funT()
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>g<!>.funAny()
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>g<!>.funNullableT()
-                                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>g<!>.funNullableAny()
-                            }
-                        }
-                    }
-                }
-            }
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>b<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>b<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>b<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>b<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>b<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>b<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>b<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>b<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>b<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>b<!>.funNullableAny()
         }
     }
 }
@@ -177,24 +158,21 @@ fun case_9() {
     val x = select(Case9_1<Int, String>(), Case9_2<Float, Char>(), null)
 
     if (x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>>?")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>>?")!>x<!>.test1()
+        <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<*, *> & ClassWithTwoTypeParameters<*, *>?")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<*, *> & ClassWithTwoTypeParameters<*, *>?")!>x<!>.test1()
         val y = x.test2()
         if (y != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>?")!>y<!>
-            val z = <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>>?")!>y<!>.test2()
-            if (z != null) {
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.equals(null)
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.propT
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.propAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.propNullableT
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.propNullableAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.funT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.funAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.funNullableT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>> & ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>, out ClassWithTwoTypeParameters<out ClassWithTwoTypeParameters<*, *>, out ClassWithTwoTypeParameters<*, *>>>>>?")!>z<!>.funNullableAny()
-            }
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>y<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>y<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>y<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>y<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>y<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>y<!>.funNullableAny()
         }
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt
index 1d2bbad55ba..1b5dad4abe4 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/25.kt
@@ -11,7 +11,10 @@
  * HELPERS: classes, objects, typealiases, enumClasses, interfaces, sealedClasses
  */
 
-// TESTCASE NUMBER: 1
+/*
+ * TESTCASE NUMBER: 1
+ * UNEXPECTED BEHAVIOUR
+ */
 open class Case1<K : Number> {
     open inner class Case1_1<L>: Case1<Int>() where L : CharSequence {
         inner class Case1_2<M>: Case1<K>.Case1_1<M>() where M : Map<K, L> {
@@ -26,7 +29,7 @@ open class Case1<K : Number> {
                     <!DEBUG_INFO_EXPRESSION_TYPE("L & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.get(0)
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.size
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.isEmpty()
-                    <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]
+                    <!TYPE_INFERENCE_ONLY_INPUT_TYPES!><!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]<!>
                 }
             }
         }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt
index 5e500da4ff9..be1a98c5f9b 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/26.kt
@@ -11,7 +11,10 @@
  * HELPERS: classes, objects, typealiases, enumClasses, interfaces, sealedClasses
  */
 
-// TESTCASE NUMBER: 1
+/*
+ * TESTCASE NUMBER: 1
+ * UNEXPECTED BEHAVIOUR
+ */
 open class Case1<K : Number> {
     open inner class Case1_1<L>: Case1<Int>() where L : CharSequence {
         inner class Case1_2<M>: Case1<K>.Case1_1<M>() where M : Map<K, L> {
@@ -26,7 +29,7 @@ open class Case1<K : Number> {
                     <!DEBUG_INFO_EXPRESSION_TYPE("L & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.get(0)
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.size
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.isEmpty()
-                    <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]
+                    <!TYPE_INFERENCE_ONLY_INPUT_TYPES!><!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]<!>
                 }
             }
         }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt
index 6e0edcc9659..a43861bfe6e 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/27.kt
@@ -11,7 +11,10 @@
  * HELPERS: classes, objects, typealiases, enumClasses, interfaces, sealedClasses
  */
 
-// TESTCASE NUMBER: 1
+/*
+ * TESTCASE NUMBER: 1
+ * UNEXPECTED BEHAVIOUR
+ */
 open class Case1<K : Number> {
     open inner class Case1_1<L>: Case1<Int>() where L : CharSequence {
         inner class Case1_2<M>: Case1<K>.Case1_1<M>() where M : Map<K, L> {
@@ -26,7 +29,7 @@ open class Case1<K : Number> {
                     <!DEBUG_INFO_EXPRESSION_TYPE("L & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.get(0)
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.size
                     <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>.isEmpty()
-                    <!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]
+                    <!TYPE_INFERENCE_ONLY_INPUT_TYPES!><!DEBUG_INFO_EXPRESSION_TYPE("M & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>x<!>[null]<!>
                 }
             }
         }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt
index a8826729658..d9e43beb530 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/29.kt
@@ -90,13 +90,10 @@ fun <T>case_8(x: Inv<T>?) {
     }
 }
 
-/*
- * TESTCASE NUMBER: 9
- * UNEXPECTED BEHAVIOUR
- */
+// TESTCASE NUMBER: 9
 inline fun <reified T>case_9(x: Out<T>?) {
     if (x?.prop_1?.prop_1?.prop_1?.prop_1 != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!><!UNSAFE_CALL!>.<!>equals(10)
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T> & Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1.prop_1<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T> & Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1.prop_1<!>.equals(10)
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/3.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/3.kt
index 0be8a3e5dad..9d4af861851 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/3.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/3.kt
@@ -226,8 +226,8 @@ fun case_19(b: Boolean) {
         }
     } else null
 
-    if (a != null && <!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19 != null && <!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19 != null && <!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19 != null && <!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x == null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing? & kotlin.Number?")!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x<!>
+    if (a != null && <!DEBUG_INFO_SMARTCAST!>a<!>.B19 != null && <!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19 != null && <!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19 != null && <!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x == null) {
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing? & kotlin.Number?")!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x<!>
     }
 }
 
@@ -296,7 +296,7 @@ fun case_25(b: Boolean) {
     val y = if (b) x else null
 
     if (y != null) {
-        val z = <!DEBUG_INFO_EXPRESSION_TYPE("case_25.<anonymous>.<no name provided>?")!><!DEBUG_INFO_EXPRESSION_TYPE("(() -> case_25.<anonymous>.<no name provided>?)? & () -> case_25.<anonymous>.<no name provided>?"), NI;DEBUG_INFO_SMARTCAST!>y<!>()<!>
+        val z = <!DEBUG_INFO_EXPRESSION_TYPE("case_25.<anonymous>.<no name provided>?")!><!DEBUG_INFO_EXPRESSION_TYPE("(() -> case_25.<anonymous>.<no name provided>?)? & () -> case_25.<anonymous>.<no name provided>?"), DEBUG_INFO_SMARTCAST!>y<!>()<!>
 
         if (z == null) {
             <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("case_25.<anonymous>.<no name provided>? & kotlin.Nothing?")!>z<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt
index 0dbcde1bffa..fa556471b12 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/30.kt
@@ -181,7 +181,7 @@ fun <T>case_12(x: Inv<T>?) {
  */
 inline fun <reified T>case_13(x: Out<T>?) {
     if (x?.prop_1?.prop_1!!.prop_1?.prop_1 != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!><!UNSAFE_CALL!>.<!>equals(10)
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!><!UNSAFE_CALL!>.<!>equals(10)
     }
 }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt
index ea1c28943d2..fb0c0039a37 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/31.kt
@@ -132,13 +132,10 @@ fun <T>case_8(x: Inv<T>?) {
     }
 }
 
-/*
- * TESTCASE NUMBER: 9
- * UNEXPECTED BEHAVIOUR
- */
+// TESTCASE NUMBER: 9
 inline fun <reified T>case_9(x: Out<T>?) {
     if (x?.prop_1?.prop_1?.prop_1?.prop_1 != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1<!UNSAFE_CALL!>.<!>prop_1<!UNSAFE_CALL!>.<!>prop_1<!><!UNSAFE_CALL!>.<!>equals(10)
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T> & Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1.prop_1<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("Inv<out T> & Inv<out T>?")!><!DEBUG_INFO_SMARTCAST!>x<!>.prop_1.prop_1.prop_1.prop_1<!>.equals(10)
     }
 }
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt
index 37d2a387e67..22537de04d1 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/32.kt
@@ -15,7 +15,7 @@
 fun <T: Any, K: Any> case_1(x: T?, y: K?) {
     x as T
     y as K
-    val z = <!DEBUG_INFO_EXPRESSION_TYPE("T & T!! & T?")!>x<!> <!USELESS_ELVIS!>?: <!DEBUG_INFO_EXPRESSION_TYPE("K & K!! & K?"), DEBUG_INFO_SMARTCAST!>y<!><!>
+    val z = <!DEBUG_INFO_EXPRESSION_TYPE("T & T!! & T?")!>x<!> <!USELESS_ELVIS!>?: <!DEBUG_INFO_EXPRESSION_TYPE("K & K?"), DEBUG_INFO_SMARTCAST!>y<!><!>
 
     <!DEBUG_INFO_EXPRESSION_TYPE("T & T?"), DEBUG_INFO_SMARTCAST!>x<!>.equals(10)
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>z<!>
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/4.kt
index 3f8acb3438b..ed19e72e61a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/4.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/4.kt
@@ -128,7 +128,7 @@ fun case_12(x: TypealiasString, y: TypealiasString) = <!DEBUG_INFO_EXPRESSION_TY
 fun case_13(x: otherpackage.EmptyClass13) =
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>if (<!SENSELESS_COMPARISON!>x != null<!>) {
         1
-    } else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & otherpackage.EmptyClass13"), NI;DEBUG_INFO_SMARTCAST!>x<!><!>
+    } else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & otherpackage.EmptyClass13"), DEBUG_INFO_SMARTCAST!>x<!><!>
 
 // TESTCASE NUMBER: 14
 class A14 {
@@ -228,8 +228,8 @@ fun case_19(b: Boolean) {
         }
     } else null
 
-    if (a != null && <!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19 != null && <!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19 != null && <!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19 != null && <!SENSELESS_COMPARISON!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x == null<!>) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & kotlin.Number")!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!><!NI;DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x<!>
+    if (a != null && <!DEBUG_INFO_SMARTCAST!>a<!>.B19 != null && <!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19 != null && <!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19 != null && <!SENSELESS_COMPARISON!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x == null<!>) {
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & kotlin.Number")!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!><!DEBUG_INFO_SMARTCAST!>a<!>.B19<!>.C19<!>.D19<!>.x<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.kt
index a12fd20d35e..4b54103bae4 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/40.kt
@@ -56,11 +56,14 @@ fun case_5(x: Any?) {
     }
 }
 
-// TESTCASE NUMBER: 6
+/*
+ * TESTCASE NUMBER: 6
+ * UNEXPECTED BEHAVIOUR
+ */
 fun case_6(x: Any?) {
     if (x is Boolean? && <!DEBUG_INFO_SMARTCAST!>x<!>!!) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Boolean"), DEBUG_INFO_SMARTCAST!>x<!>.not()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean")!>select(<!DEBUG_INFO_SMARTCAST!>x<!>)<!>.not()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Boolean?")!>x<!><!UNSAFE_CALL!>.<!>not()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Boolean?")!>select(<!DEBUG_INFO_SMARTCAST!>x<!>)<!><!UNSAFE_CALL!>.<!>not()
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/41.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/41.kt
index 5e12c2a1b14..3c16fb00041 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/41.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/41.kt
@@ -19,7 +19,7 @@ fun case_1(x: Any) {
     if (x is Interface1) {
         if (x is Interface2) {
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & Interface2 & kotlin.Any")!>x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any"), DEBUG_INFO_SMARTCAST!>x<!>.itest()
+            <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any"), DEBUG_INFO_SMARTCAST!>x<!>.itest()
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any"), DEBUG_INFO_SMARTCAST!>x<!>.itest1()
             <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any"), DEBUG_INFO_SMARTCAST!>x<!>.itest2()
         }
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/5.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/5.kt
index 418abfe7b11..70945af5c2f 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/5.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/5.kt
@@ -361,7 +361,7 @@ fun case_15(x: Any?) {
 }
 
 // TESTCASE NUMBER: 16
-fun case_16(a: Any?, b: Int = if (a is Number? && a is Int? && a !== null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int & kotlin.Number"), DEBUG_INFO_SMARTCAST!>a<!> else 0) {
+fun case_16(a: Any?, b: Int = if (a is Number? && a is Int? && a !== null) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int"), DEBUG_INFO_SMARTCAST!>a<!> else 0) {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>.equals(null)
@@ -376,7 +376,7 @@ fun case_16(a: Any?, b: Int = if (a is Number? && a is Int? && a !== null) <!DEB
 }
 
 // TESTCASE NUMBER: 17
-fun case_17(a: Any?, b: Int = if (a !is Number? || a !is Int? || a == null) 0 else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int & kotlin.Number"), DEBUG_INFO_SMARTCAST!>a<!>) {
+fun case_17(a: Any?, b: Int = if (a !is Number? || a !is Int? || a == null) 0 else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int"), DEBUG_INFO_SMARTCAST!>a<!>) {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>.equals(null)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt
index f0ee96c8535..5c3a9b63269 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/50.kt
@@ -70,27 +70,25 @@ fun <T> ClassWithSixTypeParameters<out T, *, T, in T?, *, T>.case_5() {
 
 /*
  * TESTCASE NUMBER: 6
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-25432
  */
 fun <T> case_6(y: Inv<out T>) {
     if (y.prop_3 is MutableList<*>) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>y.prop_3<!>
-        <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE_WRONG_RECEIVER!><!DEBUG_INFO_EXPRESSION_TYPE("T")!>y.prop_3<!><!NO_GET_METHOD!>[0]<!><!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!! & kotlin.collections.MutableList<*>")!>y.prop_3<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<*>"), DEBUG_INFO_SMARTCAST!>y.prop_3<!>[0]
     }
 }
 
 /*
  * TESTCASE NUMBER: 7
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-25432
  */
 fun <T> Inv<out T>.case_7() {
     if (this.prop_3 is MutableList<*>) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>this.prop_3<!>
-        <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE_WRONG_RECEIVER!><!DEBUG_INFO_EXPRESSION_TYPE("T")!>this.prop_3<!><!NO_GET_METHOD!>[0]<!><!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>prop_3<!>
-        <!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE_WRONG_RECEIVER!><!DEBUG_INFO_EXPRESSION_TYPE("T")!>prop_3<!><!NO_GET_METHOD!>[0]<!><!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!! & kotlin.collections.MutableList<*>")!>this.prop_3<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<*>"), DEBUG_INFO_SMARTCAST!>this.prop_3<!>[0]
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T!! & kotlin.collections.MutableList<*>")!>prop_3<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & kotlin.collections.MutableList<*>"), DEBUG_INFO_SMARTCAST!>prop_3<!>[0]
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/51.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/51.kt
index 1a2242b7490..e6fb2e1792a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/51.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/51.kt
@@ -149,13 +149,12 @@ fun case_12(z: Any?) {
 
 /*
  * TESTCASE NUMBER: 13
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-30927
  */
 fun case_13(z: Any?) {
     val y = z.run {
         if (this is ClassLevel6)
-            return@run <!TYPE_MISMATCH!>this<!>
+            return@run <!DEBUG_INFO_SMARTCAST!>this<!>
         this as ClassLevel3
     }
     <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel3")!>y<!>
@@ -200,14 +199,13 @@ fun case_16(z: Any?) {
 
 /*
  * TESTCASE NUMBER: 17
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-30927
  */
 fun case_17(z: Any?) {
     val y = z.run {
         when (this) {
             is Class? -> <!DEBUG_INFO_SMARTCAST!>this<!>!!
-            is Class -> return@run <!TYPE_MISMATCH!>this<!>
+            is Class -> return@run <!DEBUG_INFO_SMARTCAST!>this<!>
             is Float -> Class()
             else -> return@run Class()
         }
@@ -218,13 +216,12 @@ fun case_17(z: Any?) {
 
 /*
  * TESTCASE NUMBER: 18
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-30927
  */
 fun case_18(z: Any?) {
     val y = z.run {
         this as Int
-        <!TYPE_MISMATCH!>this<!>
+        <!DEBUG_INFO_SMARTCAST!>this<!>
     }
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>y<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>y<!>.inv()
@@ -242,13 +239,12 @@ fun case_19(z: Any?) {
 
 /*
  * TESTCASE NUMBER: 20
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-30927
  */
 fun case_20(z: Any?) {
     val y = z.run {
         this!!
-        <!TYPE_MISMATCH!>this<!>
+        <!DEBUG_INFO_SMARTCAST!>this<!>
     }
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>.equals(10)
@@ -338,13 +334,12 @@ fun case_27(z: Any?) {
 
 /*
  * TESTCASE NUMBER: 28
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-30927
  */
 fun case_28(z: Any?) {
     val y = z.run {
         if (this == null) throw IllegalStateException()
-        <!TYPE_MISMATCH!>this<!>
+        <!DEBUG_INFO_SMARTCAST!>this<!>
     }
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>y<!>.equals(10)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/55.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/55.kt
index 81e4a51a49f..a31bfd36279 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/55.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/55.kt
@@ -29,7 +29,7 @@ fun case_1(x: Any) {
 fun case_2(x: Any?) {
     if (x is String?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String")!><!DEBUG_INFO_SMARTCAST!>x<!>!!<!>.length
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.String")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.String?")!>x<!>
     }
 }
 
@@ -51,6 +51,6 @@ fun case_3(x: Any) {
 fun case_4(x: Any?) {
     if (x is Map.Entry<*, *>?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.Map.Entry<kotlin.Any?, kotlin.Any?>")!><!DEBUG_INFO_SMARTCAST!>x<!>!!<!>.value
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.collections.Map.Entry<*, *>")!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.collections.Map.Entry<*, *>?")!>x<!>
     }
 }
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/57.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/57.kt
index 5a452956efe..01a13afb341 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/57.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/57.kt
@@ -13,21 +13,19 @@
 
 /*
  * TESTCASE NUMBER: 1
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656
  */
 fun case_1(x: Any?) {
     if (x is String) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.String")!>x<!>
         val y = if (true) Class::fun_1 else Class::fun_1
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-        val z: String = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.String")!>x<!>
+        val z: String = <!DEBUG_INFO_SMARTCAST!>x<!>
     }
 }
 
 /*
  * TESTCASE NUMBER: 2
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656, KT-17386
  */
 fun case_2(x: Any?, b: Boolean?) {
@@ -38,13 +36,12 @@ fun case_2(x: Any?, b: Boolean?) {
         false -> Class::fun_2
         null -> Class::fun_3
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-    val z: Any = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>x<!>
+    val z: Any = <!DEBUG_INFO_SMARTCAST!>x<!>
 }
 
 /*
  * TESTCASE NUMBER: 3
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656
  */
 fun case_3(x: Any?, b: Boolean?) {
@@ -53,8 +50,8 @@ fun case_3(x: Any?, b: Boolean?) {
     val y = when (b) {
         else -> Class::fun_1
     }
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-    val z: Int = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>x<!>
+    val z: Int = <!DEBUG_INFO_SMARTCAST!>x<!>
 }
 
 // TESTCASE NUMBER: 4
@@ -70,20 +67,18 @@ fun case_4(x: Any?, b: Boolean?) {
 
 /*
  * TESTCASE NUMBER: 5
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656
  */
 fun case_5(x: Any?, b: Class) {
     x as Int
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>x<!>
     val y = if (true) b::fun_1 else b::fun_1
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-    val z: Int = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>x<!>
+    val z: Int = <!DEBUG_INFO_SMARTCAST!>x<!>
 }
 
 /*
  * TESTCASE NUMBER: 6
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656
  */
 fun case_6(x: Any?, b: Class) {
@@ -91,14 +86,13 @@ fun case_6(x: Any?, b: Class) {
     val z1 = x
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>x<!>
     val y = if (true) b::fun_1 else b::fun_1
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>z1<!>
-    val z2: Int = <!TYPE_MISMATCH, TYPE_MISMATCH!>z1<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>x<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int")!>z1<!>
+    val z2: Int = <!DEBUG_INFO_SMARTCAST!>z1<!>
 }
 
 /*
  * TESTCASE NUMBER: 7
- * UNEXPECTED BEHAVIOUR
  * ISSUES: KT-20656
  */
 fun case_7_1() {}
@@ -106,8 +100,8 @@ fun case_7(x: Any?) {
     if (x is String) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.String")!>x<!>
         val y = if (true) ::case_7_1 else ::case_7_1
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>x<!>
-        val z: String = <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.String")!>x<!>
+        val z: String = <!DEBUG_INFO_SMARTCAST!>x<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
index 137eb3da727..20b635170e1 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/6.kt
@@ -710,13 +710,16 @@ fun case_35(a: DeepObject.A.B.C.D.E.F.G.J?) {
     }
 }
 
-// TESTCASE NUMBER: 36
+/*
+ * TESTCASE NUMBER: 36
+ * UNEXPECTED BEHAVIOUR
+ */
 fun case_36(x: Any) {
     var z = null
 
     if (x == <!DEBUG_INFO_CONSTANT!>z<!>) {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Nothing")!>x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!>.<!UNREACHABLE_CODE!>java<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>x<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, UNREACHABLE_CODE!>java<!>
     }
 }
 
@@ -728,14 +731,17 @@ fun case_37(x: Nothing?, y: Nothing?) {
     }
 }
 
-// TESTCASE NUMBER: 38
+/*
+ * TESTCASE NUMBER: 38
+ * UNEXPECTED BEHAVIOUR
+ */
 fun case_38() {
     val z = null
 
     if (Object.prop_2 != <!DEBUG_INFO_CONSTANT!>z<!>)
     else {
         <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing & kotlin.Number")!>Object.prop_2<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>Object.prop_2<!>.<!UNREACHABLE_CODE!>java<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>Object.prop_2<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, UNREACHABLE_CODE!>java<!>
     }
 }
 
@@ -984,24 +990,30 @@ fun case_56() {
     }
 }
 
-// TESTCASE NUMBER: 57
+/*
+ * TESTCASE NUMBER: 57
+ * UNEXPECTED BEHAVIOUR
+ */
 fun case_57(a: (() -> Unit)) {
     var z = null
 
     if (a == <!DEBUG_INFO_CONSTANT!>z<!>) {
         <!DEBUG_INFO_EXPRESSION_TYPE("() -> kotlin.Unit & kotlin.Nothing")!>a<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("() -> kotlin.Unit & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>a<!>.<!UNREACHABLE_CODE!>java<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("() -> kotlin.Unit & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, UNREACHABLE_CODE!>java<!>
     }
 }
 
-// TESTCASE NUMBER: 58
+/*
+ * TESTCASE NUMBER: 58
+ * UNEXPECTED BEHAVIOUR
+ */
 fun case_58(a: ((Float) -> Int?)?, b: Float?, z: Nothing?) {
     if (a === <!DEBUG_INFO_CONSTANT!>z<!> && b == <!DEBUG_INFO_CONSTANT!>z<!> || <!DEBUG_INFO_CONSTANT!>z<!> == a && <!DEBUG_INFO_CONSTANT!>z<!> === b) {
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("((kotlin.Float) -> kotlin.Int?)? & kotlin.Nothing?")!>a<!>
         <!DEBUG_INFO_CONSTANT, DEBUG_INFO_EXPRESSION_TYPE("kotlin.Float? & kotlin.Nothing?")!>b<!>
         if (<!DEBUG_INFO_CONSTANT!>a<!> != <!DEBUG_INFO_CONSTANT!>z<!>) {
             <!DEBUG_INFO_EXPRESSION_TYPE("((kotlin.Float) -> kotlin.Int?)? & (kotlin.Float) -> kotlin.Int? & kotlin.Nothing")!>a<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("((kotlin.Float) -> kotlin.Int?)? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>a<!>.<!UNREACHABLE_CODE!>java<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("((kotlin.Float) -> kotlin.Int?)? & kotlin.Nothing"), DEBUG_INFO_SMARTCAST!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, UNREACHABLE_CODE!>java<!>
         }
     }
 }
@@ -1285,7 +1297,7 @@ fun case_71(t: Any?) {
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & Interface2 & kotlin.Any & kotlin.Any?")!>t<!>
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
-                <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
+                <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
 
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.let { <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest1(); <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest2() }
             }
@@ -1306,7 +1318,7 @@ fun case_72(t: Any?, z1: Nothing?) {
         <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & Interface2 & kotlin.Any & kotlin.Any?")!>t<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
         <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
-        <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
+        <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
 
         <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.let { <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest1(); <!DEBUG_INFO_EXPRESSION_TYPE("{Any & Interface1 & Interface2}")!>it<!>.itest2() }
     }
@@ -1328,7 +1340,7 @@ fun case_73(t: Any?) {
                     if (t != <!DEBUG_INFO_CONSTANT!>`null`<!>) {
                         <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
                         <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
-                        <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
+                        <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test1()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test2()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel1 & ClassLevel2 & Interface1 & Interface2 & Interface3 & kotlin.Any & kotlin.Any?")!>t<!>
@@ -1353,7 +1365,7 @@ fun case_74(t: Any?) {
                     if (t is Interface3?) {
                         <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
                         <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
-                        <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
+                        <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test1()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test2()
                         <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel1 & ClassLevel2 & Interface1 & Interface2 & Interface3 & kotlin.Any & kotlin.Any?")!>t<!>
@@ -1376,17 +1388,17 @@ fun case_75(t: Any?, z: Nothing?) {
             if (t !is Interface2? || t !is Interface3?) {} else {
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest2()
                 <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest1()
-                <!DEBUG_INFO_EXPRESSION_TYPE("Interface3 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
+                <!DEBUG_INFO_EXPRESSION_TYPE("Interface1 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.itest()
                 <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test1()
                 <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>.test2()
-                <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel1 & ClassLevel2 & Interface1 & Interface2 & Interface3 & kotlin.Any & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>
+                <!DEBUG_INFO_EXPRESSION_TYPE("ClassLevel2 & kotlin.Any?"), DEBUG_INFO_SMARTCAST!>t<!>
             }
         }
     }
 }
 
 // TESTCASE NUMBER: 76
-fun case_76(a: Any?, b: Int = if (<!DEPRECATED_IDENTITY_EQUALS!>a !is Number? === true<!> || a !is Int? == true || a != null == false == true) 0 else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any? & kotlin.Int"), DEBUG_INFO_SMARTCAST!>a<!>) {
+fun case_76(a: Any?, b: Int = if (<!DEPRECATED_IDENTITY_EQUALS!>a !is Number? === true<!> || a !is Int? == true || a != null == false == true) 0 else <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any? & kotlin.Int"), DEBUG_INFO_SMARTCAST!>a<!>) {
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int")!>b<!>.equals(null)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/64.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/64.kt
index 35b945293d6..b7c696bc96b 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/64.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/64.kt
@@ -26,7 +26,7 @@ class Case1<T> {
             x = getT()
         }
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>
-        return <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+        return <!TYPE_MISMATCH!>x<!>
     }
 }
 
@@ -59,7 +59,7 @@ class Case3<T> {
         var x = getTN()
         x = x ?: getT()
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x<!>
-        return <!TYPE_MISMATCH, TYPE_MISMATCH!>x<!>
+        return <!TYPE_MISMATCH!>x<!>
     }
 }
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/72.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/72.kt
index 22c349ca714..c3e51d15681 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/72.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/72.kt
@@ -22,5 +22,5 @@ fun case_1() {
     val strs = list as MutableList<String>
     strs.add("two")
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.String>")!>list<!>
-    val s: String = <!TYPE_MISMATCH, TYPE_MISMATCH!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.String>"), DEBUG_INFO_SMARTCAST!>list<!>[0]<!>
+    val s: String = <!TYPE_MISMATCH!><!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.MutableList<kotlin.Int> & kotlin.collections.MutableList<kotlin.String>"), DEBUG_INFO_SMARTCAST!>list<!>[0]<!>
 }
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/9.kt b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/9.kt
index 8e3bfc36dc9..484b210e3b2 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/9.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/dfa/pos/9.kt
@@ -170,73 +170,73 @@ fun case_8(x: ClassWithThreeTypeParameters<out Int?, out Short?, ClassWithThreeT
         <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?>?")!>x<!>.funNullableT()
         <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?>?")!>x<!>.funNullableAny()
         if (x.x != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!><!UNSAFE_CALL!>.<!>equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!><!UNSAFE_CALL!>.<!>propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!><!UNSAFE_CALL!>.<!>funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.x<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.x<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.x<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.x<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.x<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.x<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.x<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.x<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.x<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.x<!>.funNullableAny()
         }
         if (x.y != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!><!UNSAFE_CALL!>.<!>equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!><!UNSAFE_CALL!>.<!>propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!><!UNSAFE_CALL!>.<!>funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.y<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.y<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.y<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.y<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.y<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.y<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.y<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.y<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.y<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.y<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.y<!>.funNullableAny()
         }
         if (x.z != null) {
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!><!UNSAFE_CALL!>.<!>equals(null)
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propT
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!><!UNSAFE_CALL!>.<!>propAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propNullableT
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propNullableAny
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!><!UNSAFE_CALL!>.<!>funAny()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funNullableT()
-            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funNullableAny()
-            if (x.z<!UNSAFE_CALL!>.<!>x != null) {
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!><!UNSAFE_CALL!>.<!>equals(null)
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.propT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!><!UNSAFE_CALL!>.<!>propAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.propNullableT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.propNullableAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.funT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!><!UNSAFE_CALL!>.<!>funAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.funNullableT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>x.z<!UNSAFE_CALL!>.<!>x<!>.funNullableAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.equals(null)
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propT
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propNullableT
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.propNullableAny
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funAny()
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funNullableT()
+            <!DEBUG_INFO_EXPRESSION_TYPE("ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?> & ClassWithThreeTypeParameters<out kotlin.Int?, out kotlin.Short?, out kotlin.String?>?")!>x.z<!>.funNullableAny()
+            if (x.z.x != null) {
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.z.x<!>
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.z.x<!>.equals(null)
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.z.x<!>.propT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.z.x<!>.propAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.z.x<!>.propNullableT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.z.x<!>.propNullableAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.z.x<!>.funT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>x.z.x<!>.funAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.z.x<!>.funNullableT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>x.z.x<!>.funNullableAny()
             }
-            if (x.z<!UNSAFE_CALL!>.<!>y != null && x.z<!UNSAFE_CALL!>.<!>z != null) {
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!><!UNSAFE_CALL!>.<!>equals(null)
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.propT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!><!UNSAFE_CALL!>.<!>propAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.propNullableT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.propNullableAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.funT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!><!UNSAFE_CALL!>.<!>funAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.funNullableT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short?")!>x.z<!UNSAFE_CALL!>.<!>y<!>.funNullableAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.equals(null)
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.propT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!><!UNSAFE_CALL!>.<!>propAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.propNullableT
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.propNullableAny
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.funT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!><!UNSAFE_CALL!>.<!>funAny()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.funNullableT()
-                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String?")!>x.z<!UNSAFE_CALL!>.<!>z<!>.funNullableAny()
+            if (x.z.y != null && x.z.z != null) {
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.z.y<!>
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x.z.z<!>
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.z.y<!>.equals(null)
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.z.y<!>.propT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.z.y<!>.propAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.z.y<!>.propNullableT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.z.y<!>.propNullableAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.z.y<!>.funT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short"), DEBUG_INFO_SMARTCAST!>x.z.y<!>.funAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.z.y<!>.funNullableT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Short & kotlin.Short?")!>x.z.y<!>.funNullableAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String"), DEBUG_INFO_SMARTCAST!>x.z.z<!>.equals(null)
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String"), DEBUG_INFO_SMARTCAST!>x.z.z<!>.propT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String"), DEBUG_INFO_SMARTCAST!>x.z.z<!>.propAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x.z.z<!>.propNullableT
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x.z.z<!>.propNullableAny
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String"), DEBUG_INFO_SMARTCAST!>x.z.z<!>.funT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String"), DEBUG_INFO_SMARTCAST!>x.z.z<!>.funAny()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x.z.z<!>.funNullableT()
+                <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.String & kotlin.String?")!>x.z.z<!>.funNullableAny()
             }
         }
     }
@@ -428,16 +428,16 @@ fun case_17(a: Inv<out Out<Out<Out<Out<Out<Int?>?>?>?>?>?>?) {
  */
 fun case_18(a: Inv<out Int?>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -460,16 +460,16 @@ fun case_19(a: Inv<out Nothing?>) {
  */
 fun case_20(a: Inv<out Any?>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -480,16 +480,16 @@ fun case_20(a: Inv<out Any?>) {
  */
 fun case_21(a: Out<<!REDUNDANT_PROJECTION!>out<!> Int?>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Int & kotlin.Int?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -512,16 +512,16 @@ fun case_22(a: Out<<!REDUNDANT_PROJECTION!>out<!> Nothing?>) {
  */
 fun case_23(a: Out<<!REDUNDANT_PROJECTION!>out<!> Any?>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -572,16 +572,16 @@ fun case_26(a: Out<Any?>) {
  */
 fun case_27(a: Inv<in Any>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -592,16 +592,16 @@ fun case_27(a: Inv<in Any>) {
  */
 fun case_28(a: Inv<in Float>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableAny()
     }
 }
 
@@ -612,16 +612,16 @@ fun case_28(a: Inv<in Float>) {
  */
 fun case_29(a: Inv<in Nothing>) {
     if (a.x != null) {
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>equals(null)
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>propAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableT
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.propNullableAny
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!><!UNSAFE_CALL!>.<!>funAny()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableT()
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any?")!>a.x<!>.funNullableAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.equals(null)
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.propAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableT
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.propNullableAny
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any"), DEBUG_INFO_SMARTCAST!>a.x<!>.funAny()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableT()
+        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any & kotlin.Any?")!>a.x<!>.funNullableAny()
     }
 }
 
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
deleted file mode 100644
index 4d17c2c787f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 1
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the class.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class true {}
-
-internal class A: false {}
-
-interface true {}
-
-interface A: @false B {}
-
-interface A: B, C, true {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.txt
deleted file mode 100644
index a3fd31abb95..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.1.txt
+++ /dev/null
@@ -1,98 +0,0 @@
-KtFile: 2.1.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Name expected
-      PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(internal)('internal')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(false)('false')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Name expected
-      PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          MODIFIER_LIST
-            PsiErrorElement:Expected annotation identifier after '@'
-              PsiElement(AT)('@')
-          PsiErrorElement:Type expected
-            PsiElement(false)('false')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('B')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('B')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('C')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
deleted file mode 100644
index a7e997f5f89..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 10
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the companionObject.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    companion object true {
-
-    }
-}
-
-class B {
-    companion object false: A() {
-
-    }
-}
-
-class C {
-    companion object true: B by expr, x1, A() {
-
-    }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.txt
deleted file mode 100644
index 8738ce0708d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.10.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-KtFile: 2.10.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiWhiteSpace(' ')
-      FUN
-        PsiErrorElement:Expecting member declaration
-          <empty list>
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COLON)(':')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('A')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      FUN
-        PsiErrorElement:Expecting member declaration
-          <empty list>
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COLON)(':')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('B')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('by')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('expr')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('x1')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('A')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      FUN
-        PsiErrorElement:Expecting member declaration
-          <empty list>
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
deleted file mode 100644
index 213dc11bb13..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 11
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the function.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun true() {}
-
-suspend fun false() {}
-
-inline fun <T: Number> true() = false
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.txt
deleted file mode 100644
index f7269b00f1b..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.11.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-KtFile: 2.11.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting function name or receiver type
-      PsiElement(true)('true')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    MODIFIER_LIST
-      PsiElement(suspend)('suspend')
-    PsiWhiteSpace(' ')
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting function name or receiver type
-      PsiElement(false)('false')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    MODIFIER_LIST
-      PsiElement(inline)('inline')
-    PsiWhiteSpace(' ')
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Number')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting function name or receiver type
-      PsiElement(true)('true')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BOOLEAN_CONSTANT
-      PsiElement(false)('false')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
deleted file mode 100644
index 9b041de96dd..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 12
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the setter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    var x1: String
-        set(private true) = false
-
-    var x2: String
-        set(abstract final true) {
-            return field
-        }
-}
-
-var x3 = 0L
-    set(suspend false) {
-        return field
-    }
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.txt
deleted file mode 100644
index 0b84f1cbd31..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.12.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-KtFile: 2.12.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('String')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(private)('private')
-              PsiWhiteSpace(' ')
-              PsiErrorElement:Expecting parameter name
-                PsiElement(true)('true')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          BOOLEAN_CONSTANT
-            PsiElement(false)('false')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('String')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(abstract)('abstract')
-                PsiWhiteSpace(' ')
-                PsiElement(final)('final')
-              PsiWhiteSpace(' ')
-              PsiErrorElement:Expecting parameter name
-                PsiElement(true)('true')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n            ')
-            RETURN
-              PsiElement(return)('return')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('field')
-            PsiWhiteSpace('\n        ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  PROPERTY
-    PsiElement(var)('var')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('x3')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('0L')
-    PsiWhiteSpace('\n    ')
-    PROPERTY_ACCESSOR
-      PsiElement(set)('set')
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER_LIST
-        VALUE_PARAMETER
-          MODIFIER_LIST
-            PsiElement(suspend)('suspend')
-          PsiWhiteSpace(' ')
-          PsiErrorElement:Expecting parameter name
-            PsiElement(false)('false')
-      PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BLOCK
-        PsiElement(LBRACE)('{')
-        PsiWhiteSpace('\n        ')
-        RETURN
-          PsiElement(return)('return')
-          PsiWhiteSpace(' ')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('field')
-        PsiWhiteSpace('\n    ')
-        PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
deleted file mode 100644
index 79c6f2fbeb3..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 13
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the simpleUserType.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1(a: true) {}
-
-fun f2(a: false<*>) {}
-
-fun f3(a: true<out *>) {}
-
-fun f4(a: false<in List<true<*>>>) {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.txt
deleted file mode 100644
index 4abee8ad08d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.13.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-KtFile: 2.13.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(true)('true')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(false)('false')
-      PsiErrorElement:Expecting comma or ')'
-        <empty list>
-      PsiErrorElement:Expecting ')'
-        PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(MUL)('*')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f3')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(true)('true')
-      PsiErrorElement:Expecting comma or ')'
-        <empty list>
-      PsiErrorElement:Expecting ')'
-        PsiElement(LT)('<')
-  MODIFIER_LIST
-    PsiElement(out)('out')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(MUL)('*')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f4')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(false)('false')
-      PsiErrorElement:Expecting comma or ')'
-        <empty list>
-      PsiErrorElement:Expecting ')'
-        PsiElement(LT)('<')
-  MODIFIER_LIST
-    PsiElement(in)('in')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('List')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(true)('true')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(MUL)('*')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
deleted file mode 100644
index 114b5649332..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 14
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeParameter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun <true> f1() {}
-
-fun <reified T : false> T.f2() {}
-
-class B<K: L<M<true>>> {}
-
-class B<K, T: A<in false>> {}
-
-fun <T : org.jetbrains.true> T.f3() {}
-
-fun f4(a: List<out false>) {}
-
-fun f5(a: List<List<List<true?>>>) {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.txt
deleted file mode 100644
index 71ff4e4dcef..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.14.txt
+++ /dev/null
@@ -1,246 +0,0 @@
-KtFile: 2.14.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(true)('true')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        MODIFIER_LIST
-          PsiElement(reified)('reified')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('T')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(false)('false')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('T')
-    PsiElement(DOT)('.')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('K')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('L')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('M')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          PsiErrorElement:Type expected
-                            PsiElement(true)('true')
-                      PsiElement(GT)('>')
-              PsiElement(GT)('>')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('K')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(in)('in')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(false)('false')
-              PsiElement(GT)('>')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            USER_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('org')
-              PsiElement(DOT)('.')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('jetbrains')
-            PsiElement(DOT)('.')
-            PsiErrorElement:Expecting type name
-              <empty list>
-      PsiErrorElement:Missing '>'
-        PsiElement(true)('true')
-    PsiErrorElement:Expecting function name or receiver type
-      PsiElement(GT)('>')
-    PsiErrorElement:Expecting '('
-      <empty list>
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('T')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(DOT)('.')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('f3')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f4')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('List')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(out)('out')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(false)('false')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f5')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('List')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('List')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('List')
-                            TYPE_ARGUMENT_LIST
-                              PsiElement(LT)('<')
-                              TYPE_PROJECTION
-                                TYPE_REFERENCE
-                                  NULLABLE_TYPE
-                                    PsiErrorElement:Type expected
-                                      PsiElement(true)('true')
-                                    PsiElement(QUEST)('?')
-                              PsiElement(GT)('>')
-                      PsiElement(GT)('>')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
deleted file mode 100644
index da27322070a..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 15
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the parameter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1(true: Int) {}
-
-fun f2(false: Boolean, true: Boolean) = false
-
-fun f3(val true: Boolean = false, var true: Boolean) = false
-
-class A {
-    val x1: Boolean = true
-        set(false) = true
-    var x2: Boolean = false
-        set(vararg true: Boolean) = false
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.txt
deleted file mode 100644
index 1c61910751f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.15.txt
+++ /dev/null
@@ -1,179 +0,0 @@
-KtFile: 2.15.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiErrorElement:Parameter name expected
-          PsiElement(true)('true')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiErrorElement:Parameter name expected
-          PsiElement(false)('false')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      VALUE_PARAMETER
-        PsiErrorElement:Parameter name expected
-          PsiElement(true)('true')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BOOLEAN_CONSTANT
-      PsiElement(false)('false')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f3')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Parameter name expected
-          PsiElement(true)('true')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      VALUE_PARAMETER
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Parameter name expected
-          PsiElement(true)('true')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BOOLEAN_CONSTANT
-      PsiElement(false)('false')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              PsiErrorElement:Expecting parameter name
-                PsiElement(false)('false')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          BOOLEAN_CONSTANT
-            PsiElement(true)('true')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(vararg)('vararg')
-              PsiWhiteSpace(' ')
-              PsiErrorElement:Expecting parameter name
-                PsiElement(true)('true')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Boolean')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          BOOLEAN_CONSTANT
-            PsiElement(false)('false')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
deleted file mode 100644
index a4fd3ec382a..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 16
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the fileAnnotationComplex.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-@file:[JvmName.true<false>()]
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.txt
deleted file mode 100644
index ae6f477426d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.16.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-KtFile: 2.16.kt
-  FILE_ANNOTATION_LIST
-    ANNOTATION
-      PsiElement(AT)('@')
-      ANNOTATION_TARGET
-        PsiElement(file)('file')
-      PsiElement(COLON)(':')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('JvmName')
-              PsiElement(DOT)('.')
-              PsiErrorElement:Expecting type name
-                <empty list>
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(true)('true')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(false)('false')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LPAR)('(')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RPAR)(')')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(RBRACKET)(']')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
deleted file mode 100644
index 7a4fa7d0003..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 17
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the object.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-object A : true {}
-
-object B : A<B<false, true>, false> {}
-
-object true constructor() {}
-
-object false : true<false> {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.txt
deleted file mode 100644
index 5783fca6fa5..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.17.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-KtFile: 2.17.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          PsiErrorElement:Type expected
-                            PsiElement(false)('false')
-                      PsiElement(COMMA)(',')
-                      PsiWhiteSpace(' ')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          PsiErrorElement:Type expected
-                            PsiElement(true)('true')
-                      PsiElement(GT)('>')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(false)('false')
-              PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Name expected
-      PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR
-      PsiElement(constructor)('constructor')
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Name expected
-      PsiElement(false)('false')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          PsiErrorElement:Type expected
-            PsiElement(true)('true')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(false)('false')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
deleted file mode 100644
index 286a5840ba1..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 18
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeAlias.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-typealias true = Boolean
-
-private typealias false<T> = List<T>
-
-internal typealias true<false> = Map<true<false>, List<true>>
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.txt
deleted file mode 100644
index 90c486796aa..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.18.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-KtFile: 2.18.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  TYPEALIAS
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Type name expected
-      PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-  PsiWhiteSpace('\n\n')
-  TYPEALIAS
-    MODIFIER_LIST
-      PsiElement(private)('private')
-    PsiWhiteSpace(' ')
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Type name expected
-      PsiElement(false)('false')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('List')
-        TYPE_ARGUMENT_LIST
-          PsiElement(LT)('<')
-          TYPE_PROJECTION
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('T')
-          PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  TYPEALIAS
-    MODIFIER_LIST
-      PsiElement(internal)('internal')
-    PsiWhiteSpace(' ')
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Type name expected
-      PsiElement(true)('true')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(false)('false')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Map')
-        TYPE_ARGUMENT_LIST
-          PsiElement(LT)('<')
-          TYPE_PROJECTION
-            TYPE_REFERENCE
-              PsiErrorElement:Type expected
-                PsiElement(true)('true')
-          PsiErrorElement:Expecting a '>'
-            <empty list>
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(false)('false')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(COMMA)(',')
-  PsiWhiteSpace(' ')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('List')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(LT)('<')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(true)('true')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
deleted file mode 100644
index eeab375e619..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 19
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the import.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-import org.jetbrains.true.*
-
-import false
-
-import true.*;
-
-import false.*import true
-
-import org.jetbrains.kotlin as false
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.txt
deleted file mode 100644
index f1e8051401b..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.19.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-KtFile: 2.19.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      DOT_QUALIFIED_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('org')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('jetbrains')
-        PsiElement(DOT)('.')
-        PsiErrorElement:Qualified name must be a '.'-separated identifier list
-          PsiElement(true)('true')
-      PsiElement(DOT)('.')
-      PsiElement(MUL)('*')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting qualified name
-        PsiElement(false)('false')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting qualified name
-        PsiElement(true)('true')
-        PsiElement(DOT)('.')
-        PsiElement(MUL)('*')
-    PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting qualified name
-        PsiElement(false)('false')
-        PsiElement(DOT)('.')
-        PsiElement(MUL)('*')
-        PsiElement(IDENTIFIER)('import')
-        PsiWhiteSpace(' ')
-        PsiElement(true)('true')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      DOT_QUALIFIED_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('org')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('jetbrains')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('kotlin')
-      PsiWhiteSpace(' ')
-      IMPORT_ALIAS
-        PsiElement(as)('as')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Expecting identifier
-          PsiElement(false)('false')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
deleted file mode 100644
index 5eebf5c1047..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 2
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the labelReference.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    return@true
-
-    while (true) {
-        break@false
-        continue@true
-    }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.txt
deleted file mode 100644
index b8f81cee35a..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.2.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-KtFile: 2.2.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      RETURN
-        PsiElement(return)('return')
-        PsiErrorElement:Label must be named
-          PsiElement(AT)('@')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiWhiteSpace('\n\n    ')
-      WHILE
-        PsiElement(while)('while')
-        PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        CONDITION
-          BOOLEAN_CONSTANT
-            PsiElement(true)('true')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BODY
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n        ')
-            BREAK
-              PsiElement(break)('break')
-              PsiErrorElement:Label must be named
-                PsiElement(AT)('@')
-            PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-              <empty list>
-            BOOLEAN_CONSTANT
-              PsiElement(false)('false')
-            PsiWhiteSpace('\n        ')
-            CONTINUE
-              PsiElement(continue)('continue')
-              PsiErrorElement:Label must be named
-                PsiElement(AT)('@')
-            PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-              <empty list>
-            BOOLEAN_CONSTANT
-              PsiElement(true)('true')
-            PsiWhiteSpace('\n    ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
deleted file mode 100644
index 37b78563e15..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 20
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the infixFunctionCall.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    1 + 1 true 10..11
-
-    1 + 1 false 10..11 true 10 false -.9-9.0
-}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.txt
deleted file mode 100644
index 1961605ebb3..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.20.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-KtFile: 2.20.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      BINARY_EXPRESSION
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PLUS)('+')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        <empty list>
-      PsiWhiteSpace(' ')
-      BOOLEAN_CONSTANT
-        PsiElement(true)('true')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(INTEGER_LITERAL)('10')
-        PsiElement(RANGE)('..')
-        PsiElement(INTEGER_LITERAL)('11')
-      PsiWhiteSpace('\n\n    ')
-      BINARY_EXPRESSION
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PLUS)('+')
-        PsiWhiteSpace(' ')
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('1')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        <empty list>
-      PsiWhiteSpace(' ')
-      BOOLEAN_CONSTANT
-        PsiElement(false)('false')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(INTEGER_LITERAL)('10')
-        PsiElement(RANGE)('..')
-        PsiElement(INTEGER_LITERAL)('11')
-        PsiWhiteSpace(' ')
-        PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(INTEGER_LITERAL)('10')
-        PsiWhiteSpace(' ')
-        PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(MINUS)('-')
-        PsiElement(FLOAT_CONSTANT)('.9')
-        PsiElement(MINUS)('-')
-        PsiElement(FLOAT_CONSTANT)('9.0')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
deleted file mode 100644
index 3583333d802..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 21
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the catchBlock.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    try {} catch (true: Any) {}
-
-    try {} catch (@a false: Any) {}
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.txt
deleted file mode 100644
index b51eafd9cfe..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.21.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-KtFile: 2.21.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      TRY
-        PsiElement(try)('try')
-        PsiWhiteSpace(' ')
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        CATCH
-          PsiElement(catch)('catch')
-          PsiWhiteSpace(' ')
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            VALUE_PARAMETER
-              PsiErrorElement:Parameter name expected
-                PsiElement(true)('true')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Any')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      TRY
-        PsiElement(try)('try')
-        PsiWhiteSpace(' ')
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        CATCH
-          PsiElement(catch)('catch')
-          PsiWhiteSpace(' ')
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                ANNOTATION_ENTRY
-                  PsiElement(AT)('@')
-                  CONSTRUCTOR_CALLEE
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('a')
-              PsiWhiteSpace(' ')
-              PsiErrorElement:Parameter name expected
-                PsiElement(false)('false')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Any')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
deleted file mode 100644
index 211ff9fceb6..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 22
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the labelDefinition.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    val lambda_1 = true@ {}
-
-    val lambda_2 = false@ {
-        println(1)
-    }
-
-    val lambda_3 = @someAnotation true@ {
-        println(1)
-    }
-
-    val lambda_4 = @someAnotation1 @someAnotation2 @someAnotation3 false@ {
-        println(1)
-    }
-
-    val x1 = true@ 10 - 1
-    val x2 = false@(listOf(1))
-    val x3 = true@(return return) && false@ return return
-    val x4 = true@ try {} finally {} && false@ return return
-    val x5 = true@ try { false } catch(e: E) {} catch (e: Exception) { true } && false@ when (value) { true@ true -> false@ false; true@ false -> false@ true }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.txt
deleted file mode 100644
index 94efc93926f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.22.txt
+++ /dev/null
@@ -1,400 +0,0 @@
-KtFile: 2.22.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        CALL_EXPRESSION
-          BOOLEAN_CONSTANT
-            PsiElement(true)('true')
-          LAMBDA_ARGUMENT
-            ANNOTATED_EXPRESSION
-              PsiErrorElement:Expected annotation identifier after '@'
-                PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              LAMBDA_EXPRESSION
-                FUNCTION_LITERAL
-                  PsiElement(LBRACE)('{')
-                  BLOCK
-                    <empty list>
-                  PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        CALL_EXPRESSION
-          BOOLEAN_CONSTANT
-            PsiElement(false)('false')
-          LAMBDA_ARGUMENT
-            ANNOTATED_EXPRESSION
-              PsiErrorElement:Expected annotation identifier after '@'
-                PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              LAMBDA_EXPRESSION
-                FUNCTION_LITERAL
-                  PsiElement(LBRACE)('{')
-                  PsiWhiteSpace('\n        ')
-                  BLOCK
-                    CALL_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('println')
-                      VALUE_ARGUMENT_LIST
-                        PsiElement(LPAR)('(')
-                        VALUE_ARGUMENT
-                          INTEGER_CONSTANT
-                            PsiElement(INTEGER_LITERAL)('1')
-                        PsiElement(RPAR)(')')
-                  PsiWhiteSpace('\n    ')
-                  PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        ANNOTATED_EXPRESSION
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation')
-          PsiWhiteSpace(' ')
-          CALL_EXPRESSION
-            BOOLEAN_CONSTANT
-              PsiElement(true)('true')
-            LAMBDA_ARGUMENT
-              ANNOTATED_EXPRESSION
-                PsiErrorElement:Expected annotation identifier after '@'
-                  PsiElement(AT)('@')
-                PsiWhiteSpace(' ')
-                LAMBDA_EXPRESSION
-                  FUNCTION_LITERAL
-                    PsiElement(LBRACE)('{')
-                    PsiWhiteSpace('\n        ')
-                    BLOCK
-                      CALL_EXPRESSION
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('println')
-                        VALUE_ARGUMENT_LIST
-                          PsiElement(LPAR)('(')
-                          VALUE_ARGUMENT
-                            INTEGER_CONSTANT
-                              PsiElement(INTEGER_LITERAL)('1')
-                          PsiElement(RPAR)(')')
-                    PsiWhiteSpace('\n    ')
-                    PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_4')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        ANNOTATED_EXPRESSION
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation1')
-          PsiWhiteSpace(' ')
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation2')
-          PsiWhiteSpace(' ')
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation3')
-          PsiWhiteSpace(' ')
-          CALL_EXPRESSION
-            BOOLEAN_CONSTANT
-              PsiElement(false)('false')
-            LAMBDA_ARGUMENT
-              ANNOTATED_EXPRESSION
-                PsiErrorElement:Expected annotation identifier after '@'
-                  PsiElement(AT)('@')
-                PsiWhiteSpace(' ')
-                LAMBDA_EXPRESSION
-                  FUNCTION_LITERAL
-                    PsiElement(LBRACE)('{')
-                    PsiWhiteSpace('\n        ')
-                    BLOCK
-                      CALL_EXPRESSION
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('println')
-                        VALUE_ARGUMENT_LIST
-                          PsiElement(LPAR)('(')
-                          VALUE_ARGUMENT
-                            INTEGER_CONSTANT
-                              PsiElement(INTEGER_LITERAL)('1')
-                          PsiElement(RPAR)(')')
-                    PsiWhiteSpace('\n    ')
-                    PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(INTEGER_LITERAL)('10')
-        PsiWhiteSpace(' ')
-        PsiElement(MINUS)('-')
-        PsiWhiteSpace(' ')
-        PsiElement(INTEGER_LITERAL)('1')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiElement(LPAR)('(')
-        PsiElement(IDENTIFIER)('listOf')
-        PsiElement(LPAR)('(')
-        PsiElement(INTEGER_LITERAL)('1')
-        PsiElement(RPAR)(')')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiElement(LPAR)('(')
-        PsiElement(return)('return')
-        PsiWhiteSpace(' ')
-        PsiElement(return)('return')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        PsiElement(ANDAND)('&&')
-        PsiWhiteSpace(' ')
-        PsiElement(false)('false')
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(return)('return')
-        PsiWhiteSpace(' ')
-        PsiElement(return)('return')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x4')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(try)('try')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        BINARY_EXPRESSION
-          LAMBDA_EXPRESSION
-            FUNCTION_LITERAL
-              PsiElement(LBRACE)('{')
-              BLOCK
-                <empty list>
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(IDENTIFIER)('finally')
-          PsiWhiteSpace(' ')
-          LAMBDA_EXPRESSION
-            FUNCTION_LITERAL
-              PsiElement(LBRACE)('{')
-              BLOCK
-                <empty list>
-              PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(ANDAND)('&&')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(return)('return')
-        PsiWhiteSpace(' ')
-        PsiElement(return)('return')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x5')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(try)('try')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace(' ')
-            BLOCK
-              BOOLEAN_CONSTANT
-                PsiElement(false)('false')
-            PsiWhiteSpace(' ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(IDENTIFIER)('catch')
-        PARENTHESIZED
-          PsiElement(LPAR)('(')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiErrorElement:Expecting ')'
-            <empty list>
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('E')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            BLOCK
-              <empty list>
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(IDENTIFIER)('catch')
-        PsiWhiteSpace(' ')
-        PARENTHESIZED
-          PsiElement(LPAR)('(')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiErrorElement:Expecting ')'
-            <empty list>
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('Exception')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace(' ')
-            BLOCK
-              BOOLEAN_CONSTANT
-                PsiElement(true)('true')
-            PsiWhiteSpace(' ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(ANDAND)('&&')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-      PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-        PsiElement(AT)('@')
-        PsiWhiteSpace(' ')
-        PsiElement(when)('when')
-        PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        PsiElement(IDENTIFIER)('value')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      LAMBDA_EXPRESSION
-        FUNCTION_LITERAL
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace(' ')
-          BLOCK
-            BOOLEAN_CONSTANT
-              PsiElement(true)('true')
-            PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-              PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              PsiElement(true)('true')
-              PsiWhiteSpace(' ')
-              PsiElement(ARROW)('->')
-              PsiWhiteSpace(' ')
-              PsiElement(false)('false')
-              PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              PsiElement(false)('false')
-            PsiErrorElement:Expecting an element
-              PsiElement(SEMICOLON)(';')
-            PsiWhiteSpace(' ')
-            BOOLEAN_CONSTANT
-              PsiElement(true)('true')
-            PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-              PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              PsiElement(false)('false')
-              PsiWhiteSpace(' ')
-              PsiElement(ARROW)('->')
-              PsiWhiteSpace(' ')
-              PsiElement(false)('false')
-              PsiElement(AT)('@')
-              PsiWhiteSpace(' ')
-              PsiElement(true)('true')
-          PsiWhiteSpace(' ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
deleted file mode 100644
index 5546e2e8794..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 23
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the atomicExpression.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-val true = 10
-val false = "."
-
-val value_1 = true - 100 % false
-val value_2 = true.dec()
-val value_3 = "$false 10"
-val value_4 = "${true}"
-val value_5 = false + " 11..." + true + "1"
-val value_6 = false
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.txt
deleted file mode 100644
index 664e379462f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.23.txt
+++ /dev/null
@@ -1,151 +0,0 @@
-KtFile: 2.23.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting property name or receiver type
-      PsiElement(true)('true')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('10')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Expecting property name or receiver type
-      PsiElement(false)('false')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      LITERAL_STRING_TEMPLATE_ENTRY
-        PsiElement(REGULAR_STRING_PART)('.')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_1')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      BOOLEAN_CONSTANT
-        PsiElement(true)('true')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(MINUS)('-')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('100')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PERC)('%')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_2')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    DOT_QUALIFIED_EXPRESSION
-      BOOLEAN_CONSTANT
-        PsiElement(true)('true')
-      PsiElement(DOT)('.')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('dec')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_3')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      SHORT_STRING_TEMPLATE_ENTRY
-        PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-        PsiErrorElement:Keyword cannot be used as a reference
-          PsiElement(false)('false')
-      LITERAL_STRING_TEMPLATE_ENTRY
-        PsiElement(REGULAR_STRING_PART)(' 10')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_4')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      LONG_STRING_TEMPLATE_ENTRY
-        PsiElement(LONG_TEMPLATE_ENTRY_START)('${')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-        PsiElement(LONG_TEMPLATE_ENTRY_END)('}')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_5')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      BINARY_EXPRESSION
-        BINARY_EXPRESSION
-          BOOLEAN_CONSTANT
-            PsiElement(false)('false')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(PLUS)('+')
-          PsiWhiteSpace(' ')
-          STRING_TEMPLATE
-            PsiElement(OPEN_QUOTE)('"')
-            LITERAL_STRING_TEMPLATE_ENTRY
-              PsiElement(REGULAR_STRING_PART)(' 11...')
-            PsiElement(CLOSING_QUOTE)('"')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PLUS)('+')
-        PsiWhiteSpace(' ')
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(PLUS)('+')
-      PsiWhiteSpace(' ')
-      STRING_TEMPLATE
-        PsiElement(OPEN_QUOTE)('"')
-        LITERAL_STRING_TEMPLATE_ENTRY
-          PsiElement(REGULAR_STRING_PART)('1')
-        PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_6')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BOOLEAN_CONSTANT
-      PsiElement(false)('false')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
deleted file mode 100644
index 224f5f00a5a..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 24
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the variableDeclarationEntry.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    for (true: Any in 0..10) {}
-
-    val x1 = {false: Boolean ->
-        println("1")
-    }
-
-    val x2 = {true: Boolean, false: true -> }
-
-    var false: Boolean;
-
-    val x3 = fun(true: Boolean) {
-
-    }(false)
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.txt
deleted file mode 100644
index ead25c36ef0..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.24.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-KtFile: 2.24.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      FOR
-        PsiElement(for)('for')
-        PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiErrorElement:Expecting a variable name
-            PsiElement(true)('true')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('Any')
-        PsiWhiteSpace(' ')
-        PsiElement(in)('in')
-        PsiWhiteSpace(' ')
-        LOOP_RANGE
-          BINARY_EXPRESSION
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('0')
-            OPERATION_REFERENCE
-              PsiElement(RANGE)('..')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('10')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BODY
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            BLOCK
-              BOOLEAN_CONSTANT
-                PsiElement(false)('false')
-              PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                PsiElement(IDENTIFIER)('Boolean')
-                PsiWhiteSpace(' ')
-                PsiElement(ARROW)('->')
-              PsiWhiteSpace('\n        ')
-              CALL_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('println')
-                VALUE_ARGUMENT_LIST
-                  PsiElement(LPAR)('(')
-                  VALUE_ARGUMENT
-                    STRING_TEMPLATE
-                      PsiElement(OPEN_QUOTE)('"')
-                      LITERAL_STRING_TEMPLATE_ENTRY
-                        PsiElement(REGULAR_STRING_PART)('1')
-                      PsiElement(CLOSING_QUOTE)('"')
-                  PsiElement(RPAR)(')')
-            PsiWhiteSpace('\n    ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            BLOCK
-              BOOLEAN_CONSTANT
-                PsiElement(true)('true')
-              PsiErrorElement:Unexpected tokens (use ';' to separate expressions on the same line)
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                PsiElement(IDENTIFIER)('Boolean')
-                PsiElement(COMMA)(',')
-                PsiWhiteSpace(' ')
-                PsiElement(false)('false')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                PsiElement(true)('true')
-                PsiWhiteSpace(' ')
-                PsiElement(ARROW)('->')
-            PsiWhiteSpace(' ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Expecting property name or receiver type
-          PsiElement(false)('false')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        CALL_EXPRESSION
-          FUN
-            PsiElement(fun)('fun')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              VALUE_PARAMETER
-                PsiErrorElement:Parameter name expected
-                  PsiElement(true)('true')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('Boolean')
-              PsiElement(RPAR)(')')
-            PsiWhiteSpace(' ')
-            BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace('\n\n    ')
-              PsiElement(RBRACE)('}')
-          VALUE_ARGUMENT_LIST
-            PsiElement(LPAR)('(')
-            VALUE_ARGUMENT
-              BOOLEAN_CONSTANT
-                PsiElement(false)('false')
-            PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
deleted file mode 100644
index 39a92d9af8d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 25
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the valueArgument.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    f2(true = expr)
-
-    f3(false = (0L - 10 + throw E() - -.09))
-
-    f4(
-        true = return return,
-        false = try {} finally {},
-        true = 0x10
-    )
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.txt
deleted file mode 100644
index 78e8b27a4aa..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.25.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-KtFile: 2.25.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f2')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            BINARY_EXPRESSION
-              BOOLEAN_CONSTANT
-                PsiElement(true)('true')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(EQ)('=')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('expr')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f3')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            BINARY_EXPRESSION
-              BOOLEAN_CONSTANT
-                PsiElement(false)('false')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(EQ)('=')
-              PsiWhiteSpace(' ')
-              PARENTHESIZED
-                PsiElement(LPAR)('(')
-                BINARY_EXPRESSION
-                  BINARY_EXPRESSION
-                    INTEGER_CONSTANT
-                      PsiElement(INTEGER_LITERAL)('0L')
-                    PsiWhiteSpace(' ')
-                    OPERATION_REFERENCE
-                      PsiElement(MINUS)('-')
-                    PsiWhiteSpace(' ')
-                    INTEGER_CONSTANT
-                      PsiElement(INTEGER_LITERAL)('10')
-                  PsiWhiteSpace(' ')
-                  OPERATION_REFERENCE
-                    PsiElement(PLUS)('+')
-                  PsiWhiteSpace(' ')
-                  THROW
-                    PsiElement(throw)('throw')
-                    PsiWhiteSpace(' ')
-                    BINARY_EXPRESSION
-                      CALL_EXPRESSION
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('E')
-                        VALUE_ARGUMENT_LIST
-                          PsiElement(LPAR)('(')
-                          PsiElement(RPAR)(')')
-                      PsiWhiteSpace(' ')
-                      OPERATION_REFERENCE
-                        PsiElement(MINUS)('-')
-                      PsiWhiteSpace(' ')
-                      PREFIX_EXPRESSION
-                        OPERATION_REFERENCE
-                          PsiElement(MINUS)('-')
-                        FLOAT_CONSTANT
-                          PsiElement(FLOAT_CONSTANT)('.09')
-                PsiElement(RPAR)(')')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f4')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            BINARY_EXPRESSION
-              BOOLEAN_CONSTANT
-                PsiElement(true)('true')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(EQ)('=')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-                PsiWhiteSpace(' ')
-                RETURN
-                  PsiElement(return)('return')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            BINARY_EXPRESSION
-              BOOLEAN_CONSTANT
-                PsiElement(false)('false')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(EQ)('=')
-              PsiWhiteSpace(' ')
-              TRY
-                PsiElement(try)('try')
-                PsiWhiteSpace(' ')
-                BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiElement(RBRACE)('}')
-                PsiWhiteSpace(' ')
-                FINALLY
-                  PsiElement(finally)('finally')
-                  PsiWhiteSpace(' ')
-                  BLOCK
-                    PsiElement(LBRACE)('{')
-                    PsiElement(RBRACE)('}')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            BINARY_EXPRESSION
-              BOOLEAN_CONSTANT
-                PsiElement(true)('true')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(EQ)('=')
-              PsiWhiteSpace(' ')
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('0x10')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
deleted file mode 100644
index 452f929cc12..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 26
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the callableReference.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun case_1() {
-    Boolean::true
-
-    Boolean???::false::true::false
-
-    org.jetbrains.Boolean?::true::false
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.txt
deleted file mode 100644
index ac2974b3d42..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.26.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-KtFile: 2.26.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('case_1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      BOOLEAN_CONSTANT
-        PsiElement(true)('true')
-      PsiWhiteSpace('\n\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-        PsiElement(QUEST)('?')
-        PsiElement(QUEST)('?')
-        PsiElement(QUEST)('?')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      CALLABLE_REFERENCE_EXPRESSION
-        BOOLEAN_CONSTANT
-          PsiElement(false)('false')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      CALLABLE_REFERENCE_EXPRESSION
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      BOOLEAN_CONSTANT
-        PsiElement(false)('false')
-      PsiWhiteSpace('\n\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          DOT_QUALIFIED_EXPRESSION
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('org')
-            PsiElement(DOT)('.')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('jetbrains')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('Boolean')
-        PsiElement(QUEST)('?')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      CALLABLE_REFERENCE_EXPRESSION
-        BOOLEAN_CONSTANT
-          PsiElement(true)('true')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiErrorElement:Expecting an identifier
-            <empty list>
-      BOOLEAN_CONSTANT
-        PsiElement(false)('false')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
deleted file mode 100644
index 4ad3f9a8e0e..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 3
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the typeConstraint.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A <true, false>
-        where true : CharSequence,
-              false : Comparable<true>
-
-annotation class B <false>
-        where true : CharSequence,
-              @A<List<Nothing?>> @B false : Comparable<true>
-
-annotation class C <false, true> where @property:C false : CharSequence, true : Comparable<false>
-
-fun <true, false> d(): Boolean
-        where true : Any,
-              false : Iterable<*>,
-              true : Collection<*>,
-              false : MutableCollection<*>,
-              true : Comparable<false> = true == false
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.txt
deleted file mode 100644
index c189fcaf229..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.3.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-KtFile: 2.3.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(true)('true')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(false)('false')
-      PsiElement(GT)('>')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(true)('true')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(annotation)('annotation')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(false)('false')
-      PsiElement(GT)('>')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('A')
-                TYPE_ARGUMENT_LIST
-                  PsiElement(LT)('<')
-                  TYPE_PROJECTION
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('List')
-                        TYPE_ARGUMENT_LIST
-                          PsiElement(LT)('<')
-                          TYPE_PROJECTION
-                            TYPE_REFERENCE
-                              NULLABLE_TYPE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('Nothing')
-                                PsiElement(QUEST)('?')
-                          PsiElement(GT)('>')
-                  PsiElement(GT)('>')
-        PsiWhiteSpace(' ')
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('B')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(true)('true')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(annotation)('annotation')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(false)('false')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(true)('true')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          ANNOTATION_TARGET
-            PsiElement(property)('property')
-          PsiElement(COLON)(':')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('C')
-        PsiWhiteSpace(' ')
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(false)('false')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(true)('true')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiErrorElement:Type parameter name expected
-          PsiElement(false)('false')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('d')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Any')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Iterable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Collection')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(false)('false')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('MutableCollection')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        PsiErrorElement:Expecting type parameter name
-          PsiElement(true)('true')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  PsiErrorElement:Type expected
-                    PsiElement(false)('false')
-              PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      BOOLEAN_CONSTANT
-        PsiElement(true)('true')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(EQEQ)('==')
-      PsiWhiteSpace(' ')
-      BOOLEAN_CONSTANT
-        PsiElement(false)('false')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
deleted file mode 100644
index 37f8f3bba56..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 4
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the fileAnnotationSimple.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-@file:true
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.txt
deleted file mode 100644
index 0f20ea11c36..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.4.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-KtFile: 2.4.kt
-  FILE_ANNOTATION_LIST
-    PsiErrorElement:Expected annotation identifier after ':'
-      PsiElement(AT)('@')
-      PsiElement(IDENTIFIER)('file')
-      PsiElement(COLON)(':')
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(true)('true')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
deleted file mode 100644
index e8a80060aa2..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 5
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the packageComplex.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-package org.jetbrains.true
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.txt
deleted file mode 100644
index 3074e549d0b..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.5.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-KtFile: 2.5.kt
-  PACKAGE_DIRECTIVE
-    PsiElement(package)('package')
-    PsiWhiteSpace(' ')
-    DOT_QUALIFIED_EXPRESSION
-      DOT_QUALIFIED_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('org')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('jetbrains')
-      PsiElement(DOT)('.')
-      PsiErrorElement:Package name must be a '.'-separated identifier list
-        PsiElement(true)('true')
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
deleted file mode 100644
index 2101b681f4f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 6
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the packageSimple.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-package true
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.txt
deleted file mode 100644
index dcf7ffdda91..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.6.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-KtFile: 2.6.kt
-  PACKAGE_DIRECTIVE
-    PsiElement(package)('package')
-    PsiWhiteSpace(' ')
-    PsiErrorElement:Package name must be a '.'-separated identifier list
-      PsiElement(true)('true')
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
deleted file mode 100644
index 1ebe91a89fb..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 7
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the enumEntry.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-enum class A(x1: Any?) {
-    true("1"),
-    false("2");
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.txt
deleted file mode 100644
index 2d3c1d2e2bf..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.7.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-KtFile: 2.7.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PRIMARY_CONSTRUCTOR
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('x1')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            NULLABLE_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Any')
-              PsiElement(QUEST)('?')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiErrorElement:Expecting ';' after the last enum entry or '}' to close enum class body
-        <empty list>
-      PsiWhiteSpace('\n    ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(OPEN_QUOTE)('"')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(REGULAR_STRING_PART)('1')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(CLOSING_QUOTE)('"')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n    ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(OPEN_QUOTE)('"')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(REGULAR_STRING_PART)('2')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(CLOSING_QUOTE)('"')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
deleted file mode 100644
index 5252fb84395..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 8
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the stringTemplateElement.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    val x1 = "$true"
-
-    val x2 = "..." + "...$false..." + "..."
-
-    var x3 = "$true$false$true"
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.txt
deleted file mode 100644
index 31713ec84eb..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.8.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-KtFile: 2.8.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            PsiErrorElement:Keyword cannot be used as a reference
-              PsiElement(true)('true')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          BINARY_EXPRESSION
-            STRING_TEMPLATE
-              PsiElement(OPEN_QUOTE)('"')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              PsiElement(CLOSING_QUOTE)('"')
-            PsiWhiteSpace(' ')
-            OPERATION_REFERENCE
-              PsiElement(PLUS)('+')
-            PsiWhiteSpace(' ')
-            STRING_TEMPLATE
-              PsiElement(OPEN_QUOTE)('"')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              SHORT_STRING_TEMPLATE_ENTRY
-                PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-                PsiErrorElement:Keyword cannot be used as a reference
-                  PsiElement(false)('false')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              PsiElement(CLOSING_QUOTE)('"')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(PLUS)('+')
-          PsiWhiteSpace(' ')
-          STRING_TEMPLATE
-            PsiElement(OPEN_QUOTE)('"')
-            LITERAL_STRING_TEMPLATE_ENTRY
-              PsiElement(REGULAR_STRING_PART)('...')
-            PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            PsiErrorElement:Keyword cannot be used as a reference
-              PsiElement(true)('true')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            PsiErrorElement:Keyword cannot be used as a reference
-              PsiElement(false)('false')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            PsiErrorElement:Keyword cannot be used as a reference
-              PsiElement(true)('true')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
deleted file mode 100644
index f1252c53b75..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 9
- * DESCRIPTION: The use of Boolean literals as the identifier (without backtick) in the unescapedAnnotation.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    @field:true
-    val a: Int = ""
-
-    @setparam:false(true)
-    val b: Int = ""
-
-    @receiver:org.jetbrains.false<A<B, C>>(true)
-    val c: Int = ""
-
-    @org.jetbrains.false
-    val c: Int = ""
-
-    @true<A<B>, C>(false, true, false)
-    val c: Int = ""
-
-    @true
-    val c: Int = ""
-
-    @false.true.false<A<B>, C>(true, false, true)
-    val c: Int = ""
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.txt
deleted file mode 100644
index 310628754cd..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/neg/2.9.txt
+++ /dev/null
@@ -1,311 +0,0 @@
-KtFile: 2.9.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      MODIFIER_LIST
-        PsiErrorElement:Expected annotation identifier after ':'
-          PsiElement(AT)('@')
-          PsiElement(IDENTIFIER)('field')
-          PsiElement(COLON)(':')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        PsiErrorElement:Expected annotation identifier after ':'
-          PsiElement(AT)('@')
-          PsiElement(IDENTIFIER)('setparam')
-          PsiElement(COLON)(':')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('b')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          ANNOTATION_TARGET
-            PsiElement(receiver)('receiver')
-          PsiElement(COLON)(':')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('org')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('jetbrains')
-                PsiElement(DOT)('.')
-                PsiErrorElement:Expecting type name
-                  <empty list>
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('A')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('B')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('C')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('org')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('jetbrains')
-                PsiElement(DOT)('.')
-                PsiErrorElement:Expecting type name
-                  <empty list>
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        PsiErrorElement:Expected annotation identifier after '@'
-          PsiElement(AT)('@')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('A')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('B')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('C')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        PsiErrorElement:Expected annotation identifier after '@'
-          PsiElement(AT)('@')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      MODIFIER_LIST
-        PsiErrorElement:Expected annotation identifier after '@'
-          PsiElement(AT)('@')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(DOT)('.')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(DOT)('.')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('A')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LT)('<')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('B')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(IDENTIFIER)('C')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(GT)('>')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(LPAR)('(')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(false)('false')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(true)('true')
-      PsiErrorElement:Expecting member declaration
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
deleted file mode 100644
index a8d1ceb81c9..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 1
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the class.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class `true` {}
-
-internal class A: `false` {}
-
-interface `true` {}
-
-interface A: @`false` B {}
-
-interface A: B, C, `true` {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.txt
deleted file mode 100644
index 60eed282adc..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.1.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-KtFile: 2.1.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(internal)('internal')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          MODIFIER_LIST
-            ANNOTATION_ENTRY
-              PsiElement(AT)('@')
-              CONSTRUCTOR_CALLEE
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-          PsiWhiteSpace(' ')
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(interface)('interface')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('B')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('C')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
deleted file mode 100644
index 50e9463ebef..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 10
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the companionObject.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    companion object `true` {
-
-    }
-}
-
-class B {
-    companion object `false`: A() {
-
-    }
-}
-
-class C {
-    companion object `true`: B by expr, x1, A() {
-
-    }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.txt
deleted file mode 100644
index e4a8721483e..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.10.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-KtFile: 2.10.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`false`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        SUPER_TYPE_LIST
-          SUPER_TYPE_CALL_ENTRY
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      OBJECT_DECLARATION
-        MODIFIER_LIST
-          PsiElement(companion)('companion')
-        PsiWhiteSpace(' ')
-        PsiElement(object)('object')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        SUPER_TYPE_LIST
-          DELEGATED_SUPER_TYPE_ENTRY
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('B')
-            PsiWhiteSpace(' ')
-            PsiElement(by)('by')
-            PsiWhiteSpace(' ')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('expr')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace(' ')
-          SUPER_TYPE_ENTRY
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('x1')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace(' ')
-          SUPER_TYPE_CALL_ENTRY
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('A')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        CLASS_BODY
-          PsiElement(LBRACE)('{')
-          PsiWhiteSpace('\n\n    ')
-          PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
deleted file mode 100644
index 527236a1f88..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 11
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the function.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun `true`() {}
-
-suspend fun `false`() {}
-
-inline fun <T: Number> `true`() = `false`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.txt
deleted file mode 100644
index 608049ac0fc..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.11.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-KtFile: 2.11.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    MODIFIER_LIST
-      PsiElement(suspend)('suspend')
-    PsiWhiteSpace(' ')
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`false`')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    MODIFIER_LIST
-      PsiElement(inline)('inline')
-    PsiWhiteSpace(' ')
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Number')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('`false`')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
deleted file mode 100644
index 57a2950dc28..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 12
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the setter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    var x1: String
-        set(private `true`) = `false`
-
-    var x2: String
-        set(abstract final `true`) {
-            return field
-        }
-}
-
-var x3 = 0L
-    set(suspend `false`) {
-        return field
-    }
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.txt
deleted file mode 100644
index dde317d5649..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.12.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-KtFile: 2.12.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('String')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(private)('private')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('`true`')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`false`')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('String')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(abstract)('abstract')
-                PsiWhiteSpace(' ')
-                PsiElement(final)('final')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('`true`')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n            ')
-            RETURN
-              PsiElement(return)('return')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('field')
-            PsiWhiteSpace('\n        ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  PROPERTY
-    PsiElement(var)('var')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('x3')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('0L')
-    PsiWhiteSpace('\n    ')
-    PROPERTY_ACCESSOR
-      PsiElement(set)('set')
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER_LIST
-        VALUE_PARAMETER
-          MODIFIER_LIST
-            PsiElement(suspend)('suspend')
-          PsiWhiteSpace(' ')
-          PsiElement(IDENTIFIER)('`false`')
-      PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BLOCK
-        PsiElement(LBRACE)('{')
-        PsiWhiteSpace('\n        ')
-        RETURN
-          PsiElement(return)('return')
-          PsiWhiteSpace(' ')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('field')
-        PsiWhiteSpace('\n    ')
-        PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
deleted file mode 100644
index a1c7a5540ff..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 13
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the simpleUserType.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1(a: `true`) {}
-
-fun f2(a: `false`<*>) {}
-
-fun f3(a: `true`<out *>) {}
-
-fun f4(a: `false`<in List<`true`<*>>>) {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.txt
deleted file mode 100644
index 1a181c3cd48..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.13.txt
+++ /dev/null
@@ -1,121 +0,0 @@
-KtFile: 2.13.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f3')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(out)('out')
-                PsiWhiteSpace(' ')
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f4')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(in)('in')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('List')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('`true`')
-                            TYPE_ARGUMENT_LIST
-                              PsiElement(LT)('<')
-                              TYPE_PROJECTION
-                                PsiElement(MUL)('*')
-                              PsiElement(GT)('>')
-                      PsiElement(GT)('>')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
deleted file mode 100644
index 5208de5ccfb..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 14
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeParameter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun <`true`> f1() {}
-
-fun <reified T : `false`> T.f2() {}
-
-class B<K: L<M<`true`>>> {}
-
-class B<K, T: A<in `false`>> {}
-
-fun <T : org.jetbrains.`true`> T.f3() {}
-
-fun f4(a: List<out `false`>) {}
-
-fun f5(a: List<List<List<`true`?>>>) {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.txt
deleted file mode 100644
index a5b637e8891..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.14.txt
+++ /dev/null
@@ -1,241 +0,0 @@
-KtFile: 2.14.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        MODIFIER_LIST
-          PsiElement(reified)('reified')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('T')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('T')
-    PsiElement(DOT)('.')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('K')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('L')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('M')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('`true`')
-                      PsiElement(GT)('>')
-              PsiElement(GT)('>')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('K')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(in)('in')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            USER_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('org')
-              PsiElement(DOT)('.')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('jetbrains')
-            PsiElement(DOT)('.')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('T')
-    PsiElement(DOT)('.')
-    PsiElement(IDENTIFIER)('f3')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f4')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('List')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                MODIFIER_LIST
-                  PsiElement(out)('out')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f5')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('List')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('List')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('List')
-                            TYPE_ARGUMENT_LIST
-                              PsiElement(LT)('<')
-                              TYPE_PROJECTION
-                                TYPE_REFERENCE
-                                  NULLABLE_TYPE
-                                    USER_TYPE
-                                      REFERENCE_EXPRESSION
-                                        PsiElement(IDENTIFIER)('`true`')
-                                    PsiElement(QUEST)('?')
-                              PsiElement(GT)('>')
-                      PsiElement(GT)('>')
-              PsiElement(GT)('>')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
deleted file mode 100644
index 3ec11b1089d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 15
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the parameter.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1(`true`: Int) {}
-
-fun f2(`false`: Boolean, `true`: Boolean) = `false`
-
-fun f3(val `true`: Boolean = `false`, var `true`: Boolean) = `false`
-
-class A {
-    val x1: Boolean = `true`
-        set(`false`) = `true`
-    var x2: Boolean = `false`
-        set(vararg `true`: Boolean) = `false`
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.txt
deleted file mode 100644
index 81c5740733d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.15.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-KtFile: 2.15.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f2')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      VALUE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('`false`')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f3')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      VALUE_PARAMETER
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      VALUE_PARAMETER
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('`false`')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              PsiElement(IDENTIFIER)('`false`')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace('\n        ')
-        PROPERTY_ACCESSOR
-          PsiElement(set)('set')
-          PsiElement(LPAR)('(')
-          VALUE_PARAMETER_LIST
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                PsiElement(vararg)('vararg')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('`true`')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Boolean')
-          PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`false`')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
deleted file mode 100644
index d2757b8f98c..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 16
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationComplex.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-@file:[JvmName.`true`<`false`>()]
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.txt
deleted file mode 100644
index aeb5f1aa495..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.16.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-KtFile: 2.16.kt
-  FILE_ANNOTATION_LIST
-    ANNOTATION
-      PsiElement(AT)('@')
-      ANNOTATION_TARGET
-        PsiElement(file)('file')
-      PsiElement(COLON)(':')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('JvmName')
-              PsiElement(DOT)('.')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`true`')
-              TYPE_ARGUMENT_LIST
-                PsiElement(LT)('<')
-                TYPE_PROJECTION
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('`false`')
-                PsiElement(GT)('>')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-      PsiElement(RBRACKET)(']')
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
deleted file mode 100644
index efbb4bdf799..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 17
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the object.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-object A : `true` {}
-
-object B : A<B<`false`, `true`>, `false`> {}
-
-object `true` constructor() {}
-
-object `false` : `true`<`false`> {}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.txt
deleted file mode 100644
index bd1ab4aaeab..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.17.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-KtFile: 2.17.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('A')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('B')
-                    TYPE_ARGUMENT_LIST
-                      PsiElement(LT)('<')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('`false`')
-                      PsiElement(COMMA)(',')
-                      PsiWhiteSpace(' ')
-                      TYPE_PROJECTION
-                        TYPE_REFERENCE
-                          USER_TYPE
-                            REFERENCE_EXPRESSION
-                              PsiElement(IDENTIFIER)('`true`')
-                      PsiElement(GT)('>')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    PRIMARY_CONSTRUCTOR
-      PsiElement(constructor)('constructor')
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
-  PsiWhiteSpace('\n\n')
-  OBJECT_DECLARATION
-    PsiElement(object)('object')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`false`')
-    PsiWhiteSpace(' ')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    SUPER_TYPE_LIST
-      SUPER_TYPE_ENTRY
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
deleted file mode 100644
index f6657921ccf..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 18
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeAlias.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-typealias `true` = Boolean
-
-private typealias `false`<T> = List<T>
-
-internal typealias `true`<`false`> = Map<`true`<`false`>, List<`true`>>
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.txt
deleted file mode 100644
index e1d9a820fa9..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.18.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-KtFile: 2.18.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  TYPEALIAS
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-  PsiWhiteSpace('\n\n')
-  TYPEALIAS
-    MODIFIER_LIST
-      PsiElement(private)('private')
-    PsiWhiteSpace(' ')
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`false`')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('T')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('List')
-        TYPE_ARGUMENT_LIST
-          PsiElement(LT)('<')
-          TYPE_PROJECTION
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('T')
-          PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  TYPEALIAS
-    MODIFIER_LIST
-      PsiElement(internal)('internal')
-    PsiWhiteSpace(' ')
-    PsiElement(typealias)('typealias')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Map')
-        TYPE_ARGUMENT_LIST
-          PsiElement(LT)('<')
-          TYPE_PROJECTION
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-                TYPE_ARGUMENT_LIST
-                  PsiElement(LT)('<')
-                  TYPE_PROJECTION
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('`false`')
-                  PsiElement(GT)('>')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace(' ')
-          TYPE_PROJECTION
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('List')
-                TYPE_ARGUMENT_LIST
-                  PsiElement(LT)('<')
-                  TYPE_PROJECTION
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('`true`')
-                  PsiElement(GT)('>')
-          PsiElement(GT)('>')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
deleted file mode 100644
index f34f8d6d826..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 19
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the import.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-import org.jetbrains.`true`.*
-
-import `false`
-
-import `true`.*;
-
-import `false`.*import `true`
-
-import org.jetbrains.kotlin as `false`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.txt
deleted file mode 100644
index 3cd75192298..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.19.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-KtFile: 2.19.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      DOT_QUALIFIED_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('org')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('jetbrains')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-      PsiElement(DOT)('.')
-      PsiElement(MUL)('*')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`false`')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(DOT)('.')
-      PsiElement(MUL)('*')
-      PsiElement(SEMICOLON)(';')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(DOT)('.')
-      PsiElement(MUL)('*')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace('\n\n')
-    IMPORT_DIRECTIVE
-      PsiElement(import)('import')
-      PsiWhiteSpace(' ')
-      DOT_QUALIFIED_EXPRESSION
-        DOT_QUALIFIED_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('org')
-          PsiElement(DOT)('.')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('jetbrains')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('kotlin')
-      PsiWhiteSpace(' ')
-      IMPORT_ALIAS
-        PsiElement(as)('as')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`false`')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
deleted file mode 100644
index d4689d6c5a2..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 2
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelReference.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    return@`true`
-
-    while (true) {
-        break@`false`
-        continue@`true`
-    }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.txt
deleted file mode 100644
index b073caa5bdd..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.2.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-KtFile: 2.2.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      RETURN
-        PsiElement(return)('return')
-        LABEL_QUALIFIER
-          LABEL
-            PsiElement(AT)('@')
-            PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace('\n\n    ')
-      WHILE
-        PsiElement(while)('while')
-        PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        CONDITION
-          BOOLEAN_CONSTANT
-            PsiElement(true)('true')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BODY
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n        ')
-            BREAK
-              PsiElement(break)('break')
-              LABEL_QUALIFIER
-                LABEL
-                  PsiElement(AT)('@')
-                  PsiElement(IDENTIFIER)('`false`')
-            PsiWhiteSpace('\n        ')
-            CONTINUE
-              PsiElement(continue)('continue')
-              LABEL_QUALIFIER
-                LABEL
-                  PsiElement(AT)('@')
-                  PsiElement(IDENTIFIER)('`true`')
-            PsiWhiteSpace('\n    ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
deleted file mode 100644
index caf440f6f29..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 20
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the infixFunctionCall.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    1 + 1 `true` 10..11
-
-    1 + 1 `false` 10..11 `true` 10 `false` -.9-9.0
-}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.txt
deleted file mode 100644
index 2ff7463284c..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.20.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-KtFile: 2.20.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      BINARY_EXPRESSION
-        BINARY_EXPRESSION
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('1')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(PLUS)('+')
-          PsiWhiteSpace(' ')
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('1')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('10')
-          OPERATION_REFERENCE
-            PsiElement(RANGE)('..')
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('11')
-      PsiWhiteSpace('\n\n    ')
-      BINARY_EXPRESSION
-        BINARY_EXPRESSION
-          BINARY_EXPRESSION
-            BINARY_EXPRESSION
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('1')
-              PsiWhiteSpace(' ')
-              OPERATION_REFERENCE
-                PsiElement(PLUS)('+')
-              PsiWhiteSpace(' ')
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('1')
-            PsiWhiteSpace(' ')
-            OPERATION_REFERENCE
-              PsiElement(IDENTIFIER)('`false`')
-            PsiWhiteSpace(' ')
-            BINARY_EXPRESSION
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('10')
-              OPERATION_REFERENCE
-                PsiElement(RANGE)('..')
-              INTEGER_CONSTANT
-                PsiElement(INTEGER_LITERAL)('11')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(IDENTIFIER)('`true`')
-          PsiWhiteSpace(' ')
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('10')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          PREFIX_EXPRESSION
-            OPERATION_REFERENCE
-              PsiElement(MINUS)('-')
-            FLOAT_CONSTANT
-              PsiElement(FLOAT_CONSTANT)('.9')
-          OPERATION_REFERENCE
-            PsiElement(MINUS)('-')
-          FLOAT_CONSTANT
-            PsiElement(FLOAT_CONSTANT)('9.0')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
deleted file mode 100644
index df54e686208..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 21
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the catchBlock.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    try {} catch (`true`: Any) {}
-
-    try {} catch (@a `false`: Any) {}
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.txt
deleted file mode 100644
index 25c964d9e7f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.21.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-KtFile: 2.21.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      TRY
-        PsiElement(try)('try')
-        PsiWhiteSpace(' ')
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        CATCH
-          PsiElement(catch)('catch')
-          PsiWhiteSpace(' ')
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            VALUE_PARAMETER
-              PsiElement(IDENTIFIER)('`true`')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Any')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      TRY
-        PsiElement(try)('try')
-        PsiWhiteSpace(' ')
-        BLOCK
-          PsiElement(LBRACE)('{')
-          PsiElement(RBRACE)('}')
-        PsiWhiteSpace(' ')
-        CATCH
-          PsiElement(catch)('catch')
-          PsiWhiteSpace(' ')
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            VALUE_PARAMETER
-              MODIFIER_LIST
-                ANNOTATION_ENTRY
-                  PsiElement(AT)('@')
-                  CONSTRUCTOR_CALLEE
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('a')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('`false`')
-              PsiElement(COLON)(':')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('Any')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
deleted file mode 100644
index 58c3d151fb7..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 22
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the labelDefinition.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f() {
-    val lambda_1 = `true`@ {}
-
-    val lambda_2 = `false`@ {
-        println(1)
-    }
-
-    val lambda_3 = @someAnotation `true`@ {
-        println(1)
-    }
-
-    val lambda_4 = @someAnotation1 @someAnotation2 @someAnotation3 `false`@ {
-        println(1)
-    }
-
-    val x1 = `true`@ 10 - 1
-    val x2 = `false`@(listOf(1))
-    val x3 = `true`@(return return) && `false`@ return return
-    val x4 = `true`@ try {} finally {} && `false`@ return return
-    val x5 = `true`@ try { false } catch(e: E) {} catch (e: Exception) { true } && `false`@ when (value) { `true`@ true -> `false`@ false; `true`@ false -> `false`@ true }
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.txt
deleted file mode 100644
index d2b2dd35836..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.22.txt
+++ /dev/null
@@ -1,421 +0,0 @@
-KtFile: 2.22.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LABELED_EXPRESSION
-          LABEL_QUALIFIER
-            LABEL
-              PsiElement(IDENTIFIER)('`true`')
-              PsiElement(AT)('@')
-          PsiWhiteSpace(' ')
-          LAMBDA_EXPRESSION
-            FUNCTION_LITERAL
-              PsiElement(LBRACE)('{')
-              BLOCK
-                <empty list>
-              PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LABELED_EXPRESSION
-          LABEL_QUALIFIER
-            LABEL
-              PsiElement(IDENTIFIER)('`false`')
-              PsiElement(AT)('@')
-          PsiWhiteSpace(' ')
-          LAMBDA_EXPRESSION
-            FUNCTION_LITERAL
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace('\n        ')
-              BLOCK
-                CALL_EXPRESSION
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('println')
-                  VALUE_ARGUMENT_LIST
-                    PsiElement(LPAR)('(')
-                    VALUE_ARGUMENT
-                      INTEGER_CONSTANT
-                        PsiElement(INTEGER_LITERAL)('1')
-                    PsiElement(RPAR)(')')
-              PsiWhiteSpace('\n    ')
-              PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        ANNOTATED_EXPRESSION
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation')
-          PsiWhiteSpace(' ')
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            LAMBDA_EXPRESSION
-              FUNCTION_LITERAL
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n        ')
-                BLOCK
-                  CALL_EXPRESSION
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('println')
-                    VALUE_ARGUMENT_LIST
-                      PsiElement(LPAR)('(')
-                      VALUE_ARGUMENT
-                        INTEGER_CONSTANT
-                          PsiElement(INTEGER_LITERAL)('1')
-                      PsiElement(RPAR)(')')
-                PsiWhiteSpace('\n    ')
-                PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('lambda_4')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        ANNOTATED_EXPRESSION
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation1')
-          PsiWhiteSpace(' ')
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation2')
-          PsiWhiteSpace(' ')
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('someAnotation3')
-          PsiWhiteSpace(' ')
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            LAMBDA_EXPRESSION
-              FUNCTION_LITERAL
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n        ')
-                BLOCK
-                  CALL_EXPRESSION
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('println')
-                    VALUE_ARGUMENT_LIST
-                      PsiElement(LPAR)('(')
-                      VALUE_ARGUMENT
-                        INTEGER_CONSTANT
-                          PsiElement(INTEGER_LITERAL)('1')
-                      PsiElement(RPAR)(')')
-                PsiWhiteSpace('\n    ')
-                PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('10')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(MINUS)('-')
-          PsiWhiteSpace(' ')
-          INTEGER_CONSTANT
-            PsiElement(INTEGER_LITERAL)('1')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LABELED_EXPRESSION
-          LABEL_QUALIFIER
-            LABEL
-              PsiElement(IDENTIFIER)('`false`')
-              PsiElement(AT)('@')
-          PARENTHESIZED
-            PsiElement(LPAR)('(')
-            CALL_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('listOf')
-              VALUE_ARGUMENT_LIST
-                PsiElement(LPAR)('(')
-                VALUE_ARGUMENT
-                  INTEGER_CONSTANT
-                    PsiElement(INTEGER_LITERAL)('1')
-                PsiElement(RPAR)(')')
-            PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(AT)('@')
-            PARENTHESIZED
-              PsiElement(LPAR)('(')
-              RETURN
-                PsiElement(return)('return')
-                PsiWhiteSpace(' ')
-                RETURN
-                  PsiElement(return)('return')
-              PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(ANDAND)('&&')
-          PsiWhiteSpace(' ')
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            RETURN
-              PsiElement(return)('return')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x4')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            TRY
-              PsiElement(try)('try')
-              PsiWhiteSpace(' ')
-              BLOCK
-                PsiElement(LBRACE)('{')
-                PsiElement(RBRACE)('}')
-              PsiWhiteSpace(' ')
-              FINALLY
-                PsiElement(finally)('finally')
-                PsiWhiteSpace(' ')
-                BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiElement(RBRACE)('}')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(ANDAND)('&&')
-          PsiWhiteSpace(' ')
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            RETURN
-              PsiElement(return)('return')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x5')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            TRY
-              PsiElement(try)('try')
-              PsiWhiteSpace(' ')
-              BLOCK
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace(' ')
-                BOOLEAN_CONSTANT
-                  PsiElement(false)('false')
-                PsiWhiteSpace(' ')
-                PsiElement(RBRACE)('}')
-              PsiWhiteSpace(' ')
-              CATCH
-                PsiElement(catch)('catch')
-                VALUE_PARAMETER_LIST
-                  PsiElement(LPAR)('(')
-                  VALUE_PARAMETER
-                    PsiElement(IDENTIFIER)('e')
-                    PsiElement(COLON)(':')
-                    PsiWhiteSpace(' ')
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('E')
-                  PsiElement(RPAR)(')')
-                PsiWhiteSpace(' ')
-                BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiElement(RBRACE)('}')
-              PsiWhiteSpace(' ')
-              CATCH
-                PsiElement(catch)('catch')
-                PsiWhiteSpace(' ')
-                VALUE_PARAMETER_LIST
-                  PsiElement(LPAR)('(')
-                  VALUE_PARAMETER
-                    PsiElement(IDENTIFIER)('e')
-                    PsiElement(COLON)(':')
-                    PsiWhiteSpace(' ')
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('Exception')
-                  PsiElement(RPAR)(')')
-                PsiWhiteSpace(' ')
-                BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiWhiteSpace(' ')
-                  BOOLEAN_CONSTANT
-                    PsiElement(true)('true')
-                  PsiWhiteSpace(' ')
-                  PsiElement(RBRACE)('}')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(ANDAND)('&&')
-          PsiWhiteSpace(' ')
-          LABELED_EXPRESSION
-            LABEL_QUALIFIER
-              LABEL
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(AT)('@')
-            PsiWhiteSpace(' ')
-            WHEN
-              PsiElement(when)('when')
-              PsiWhiteSpace(' ')
-              PsiElement(LPAR)('(')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('value')
-              PsiElement(RPAR)(')')
-              PsiWhiteSpace(' ')
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace(' ')
-              WHEN_ENTRY
-                WHEN_CONDITION_WITH_EXPRESSION
-                  LABELED_EXPRESSION
-                    LABEL_QUALIFIER
-                      LABEL
-                        PsiElement(IDENTIFIER)('`true`')
-                        PsiElement(AT)('@')
-                    PsiWhiteSpace(' ')
-                    BOOLEAN_CONSTANT
-                      PsiElement(true)('true')
-                PsiWhiteSpace(' ')
-                PsiElement(ARROW)('->')
-                PsiWhiteSpace(' ')
-                LABELED_EXPRESSION
-                  LABEL_QUALIFIER
-                    LABEL
-                      PsiElement(IDENTIFIER)('`false`')
-                      PsiElement(AT)('@')
-                  PsiWhiteSpace(' ')
-                  BOOLEAN_CONSTANT
-                    PsiElement(false)('false')
-              PsiElement(SEMICOLON)(';')
-              PsiWhiteSpace(' ')
-              WHEN_ENTRY
-                WHEN_CONDITION_WITH_EXPRESSION
-                  LABELED_EXPRESSION
-                    LABEL_QUALIFIER
-                      LABEL
-                        PsiElement(IDENTIFIER)('`true`')
-                        PsiElement(AT)('@')
-                    PsiWhiteSpace(' ')
-                    BOOLEAN_CONSTANT
-                      PsiElement(false)('false')
-                PsiWhiteSpace(' ')
-                PsiElement(ARROW)('->')
-                PsiWhiteSpace(' ')
-                LABELED_EXPRESSION
-                  LABEL_QUALIFIER
-                    LABEL
-                      PsiElement(IDENTIFIER)('`false`')
-                      PsiElement(AT)('@')
-                  PsiWhiteSpace(' ')
-                  BOOLEAN_CONSTANT
-                    PsiElement(true)('true')
-              PsiWhiteSpace(' ')
-              PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
deleted file mode 100644
index 154a20321ee..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 23
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the atomicExpression.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-val `true` = 10
-val `false` = "."
-
-val value_1 = `true` - 100 % `false`
-val value_2 = `true`.dec()
-val value_3 = "$`false` 10"
-val value_4 = "${`true`}"
-val value_5 = `false` + " 11..." + `true` + "1"
-val value_6 = `false`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.txt
deleted file mode 100644
index 7db72275e40..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.23.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-KtFile: 2.23.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`true`')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    INTEGER_CONSTANT
-      PsiElement(INTEGER_LITERAL)('10')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('`false`')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      LITERAL_STRING_TEMPLATE_ENTRY
-        PsiElement(REGULAR_STRING_PART)('.')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_1')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(MINUS)('-')
-      PsiWhiteSpace(' ')
-      BINARY_EXPRESSION
-        INTEGER_CONSTANT
-          PsiElement(INTEGER_LITERAL)('100')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PERC)('%')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_2')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    DOT_QUALIFIED_EXPRESSION
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(DOT)('.')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('dec')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          PsiElement(RPAR)(')')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_3')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      SHORT_STRING_TEMPLATE_ENTRY
-        PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-      LITERAL_STRING_TEMPLATE_ENTRY
-        PsiElement(REGULAR_STRING_PART)(' 10')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_4')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    STRING_TEMPLATE
-      PsiElement(OPEN_QUOTE)('"')
-      LONG_STRING_TEMPLATE_ENTRY
-        PsiElement(LONG_TEMPLATE_ENTRY_START)('${')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiElement(LONG_TEMPLATE_ENTRY_END)('}')
-      PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_5')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      BINARY_EXPRESSION
-        BINARY_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`false`')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(PLUS)('+')
-          PsiWhiteSpace(' ')
-          STRING_TEMPLATE
-            PsiElement(OPEN_QUOTE)('"')
-            LITERAL_STRING_TEMPLATE_ENTRY
-              PsiElement(REGULAR_STRING_PART)(' 11...')
-            PsiElement(CLOSING_QUOTE)('"')
-        PsiWhiteSpace(' ')
-        OPERATION_REFERENCE
-          PsiElement(PLUS)('+')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(PLUS)('+')
-      PsiWhiteSpace(' ')
-      STRING_TEMPLATE
-        PsiElement(OPEN_QUOTE)('"')
-        LITERAL_STRING_TEMPLATE_ENTRY
-          PsiElement(REGULAR_STRING_PART)('1')
-        PsiElement(CLOSING_QUOTE)('"')
-  PsiWhiteSpace('\n')
-  PROPERTY
-    PsiElement(val)('val')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('value_6')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('`false`')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
deleted file mode 100644
index 11f455a449c..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 24
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the variableDeclarationEntry.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    for (`true`: Any in 0..10) {}
-
-    val x1 = {`false`: Boolean ->
-        println("1")
-    }
-
-    val x2 = {`true`: Boolean, `false`: `true` -> }
-
-    var `false`: Boolean;
-
-    val x3 = fun(`true`: Boolean) {
-
-    }(`false`)
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.txt
deleted file mode 100644
index e9d7a4408e8..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.24.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-KtFile: 2.24.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      FOR
-        PsiElement(for)('for')
-        PsiWhiteSpace(' ')
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('`true`')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('Any')
-        PsiWhiteSpace(' ')
-        PsiElement(in)('in')
-        PsiWhiteSpace(' ')
-        LOOP_RANGE
-          BINARY_EXPRESSION
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('0')
-            OPERATION_REFERENCE
-              PsiElement(RANGE)('..')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('10')
-        PsiElement(RPAR)(')')
-        PsiWhiteSpace(' ')
-        BODY
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            VALUE_PARAMETER_LIST
-              VALUE_PARAMETER
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('Boolean')
-            PsiWhiteSpace(' ')
-            PsiElement(ARROW)('->')
-            PsiWhiteSpace('\n        ')
-            BLOCK
-              CALL_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('println')
-                VALUE_ARGUMENT_LIST
-                  PsiElement(LPAR)('(')
-                  VALUE_ARGUMENT
-                    STRING_TEMPLATE
-                      PsiElement(OPEN_QUOTE)('"')
-                      LITERAL_STRING_TEMPLATE_ENTRY
-                        PsiElement(REGULAR_STRING_PART)('1')
-                      PsiElement(CLOSING_QUOTE)('"')
-                  PsiElement(RPAR)(')')
-            PsiWhiteSpace('\n    ')
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        LAMBDA_EXPRESSION
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            VALUE_PARAMETER_LIST
-              VALUE_PARAMETER
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('Boolean')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              VALUE_PARAMETER
-                PsiElement(IDENTIFIER)('`false`')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`true`')
-            PsiWhiteSpace(' ')
-            PsiElement(ARROW)('->')
-            PsiWhiteSpace(' ')
-            BLOCK
-              <empty list>
-            PsiElement(RBRACE)('}')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('`false`')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-      PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        CALL_EXPRESSION
-          FUN
-            PsiElement(fun)('fun')
-            VALUE_PARAMETER_LIST
-              PsiElement(LPAR)('(')
-              VALUE_PARAMETER
-                PsiElement(IDENTIFIER)('`true`')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('Boolean')
-              PsiElement(RPAR)(')')
-            PsiWhiteSpace(' ')
-            BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace('\n\n    ')
-              PsiElement(RBRACE)('}')
-          VALUE_ARGUMENT_LIST
-            PsiElement(LPAR)('(')
-            VALUE_ARGUMENT
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`false`')
-            PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
deleted file mode 100644
index 2cfc7c95bc9..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 25
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the valueArgument.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    f2(`true` = expr)
-
-    f3(`false` = (0L - 10 + throw E() - -.09))
-
-    f4(
-        `true` = return return,
-        `false` = try {} finally {},
-        `true` = 0x10
-    )
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.txt
deleted file mode 100644
index d68bd3218f3..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.25.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-KtFile: 2.25.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f2')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            VALUE_ARGUMENT_NAME
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`true`')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('expr')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f3')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            VALUE_ARGUMENT_NAME
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`false`')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            PARENTHESIZED
-              PsiElement(LPAR)('(')
-              BINARY_EXPRESSION
-                BINARY_EXPRESSION
-                  INTEGER_CONSTANT
-                    PsiElement(INTEGER_LITERAL)('0L')
-                  PsiWhiteSpace(' ')
-                  OPERATION_REFERENCE
-                    PsiElement(MINUS)('-')
-                  PsiWhiteSpace(' ')
-                  INTEGER_CONSTANT
-                    PsiElement(INTEGER_LITERAL)('10')
-                PsiWhiteSpace(' ')
-                OPERATION_REFERENCE
-                  PsiElement(PLUS)('+')
-                PsiWhiteSpace(' ')
-                THROW
-                  PsiElement(throw)('throw')
-                  PsiWhiteSpace(' ')
-                  BINARY_EXPRESSION
-                    CALL_EXPRESSION
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('E')
-                      VALUE_ARGUMENT_LIST
-                        PsiElement(LPAR)('(')
-                        PsiElement(RPAR)(')')
-                    PsiWhiteSpace(' ')
-                    OPERATION_REFERENCE
-                      PsiElement(MINUS)('-')
-                    PsiWhiteSpace(' ')
-                    PREFIX_EXPRESSION
-                      OPERATION_REFERENCE
-                        PsiElement(MINUS)('-')
-                      FLOAT_CONSTANT
-                        PsiElement(FLOAT_CONSTANT)('.09')
-              PsiElement(RPAR)(')')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n\n    ')
-      CALL_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('f4')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            VALUE_ARGUMENT_NAME
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`true`')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            RETURN
-              PsiElement(return)('return')
-              PsiWhiteSpace(' ')
-              RETURN
-                PsiElement(return)('return')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            VALUE_ARGUMENT_NAME
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`false`')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            TRY
-              PsiElement(try)('try')
-              PsiWhiteSpace(' ')
-              BLOCK
-                PsiElement(LBRACE)('{')
-                PsiElement(RBRACE)('}')
-              PsiWhiteSpace(' ')
-              FINALLY
-                PsiElement(finally)('finally')
-                PsiWhiteSpace(' ')
-                BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiElement(RBRACE)('}')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace('\n        ')
-          VALUE_ARGUMENT
-            VALUE_ARGUMENT_NAME
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('`true`')
-            PsiWhiteSpace(' ')
-            PsiElement(EQ)('=')
-            PsiWhiteSpace(' ')
-            INTEGER_CONSTANT
-              PsiElement(INTEGER_LITERAL)('0x10')
-          PsiWhiteSpace('\n    ')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
deleted file mode 100644
index f50b6a8d3aa..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 26
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the callableReference.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun case_1() {
-    Boolean::`true`
-
-    Boolean???::`false`::`true`::`false`
-
-    org.jetbrains.Boolean?::`true`::`false`
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.txt
deleted file mode 100644
index 8895db32f7d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.26.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-KtFile: 2.26.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('case_1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace('\n\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        CALLABLE_REFERENCE_EXPRESSION
-          CALLABLE_REFERENCE_EXPRESSION
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-            PsiElement(QUEST)('?')
-            PsiElement(QUEST)('?')
-            PsiElement(QUEST)('?')
-            PsiElement(COLONCOLON)('::')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-          PsiElement(COLONCOLON)('::')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-      PsiWhiteSpace('\n\n    ')
-      CALLABLE_REFERENCE_EXPRESSION
-        CALLABLE_REFERENCE_EXPRESSION
-          DOT_QUALIFIED_EXPRESSION
-            DOT_QUALIFIED_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('org')
-              PsiElement(DOT)('.')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('jetbrains')
-            PsiElement(DOT)('.')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Boolean')
-          PsiElement(QUEST)('?')
-          PsiElement(COLONCOLON)('::')
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('`true`')
-        PsiElement(COLONCOLON)('::')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
deleted file mode 100644
index 04c180a08e2..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 3
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the typeConstraint.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A <`true`, `false`>
-        where `true` : CharSequence,
-              `false` : Comparable<`true`>
-
-annotation class B <`false`>
-        where `true` : CharSequence,
-              @A<List<Nothing?>> @B `false` : Comparable<`true`>
-
-annotation class C <`false`, `true`> where @property:C `false` : CharSequence, `true` : Comparable<`false`>
-
-fun <`true`, `false`> d(): Boolean
-        where `true` : Any,
-              `false` : Iterable<*>,
-              `true` : Collection<*>,
-              `false` : MutableCollection<*>,
-              `true` : Comparable<`false`> = `true` == `false`
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.txt
deleted file mode 100644
index 3aadcc78591..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.3.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-KtFile: 2.3.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`true`')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(annotation)('annotation')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('B')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('A')
-                TYPE_ARGUMENT_LIST
-                  PsiElement(LT)('<')
-                  TYPE_PROJECTION
-                    TYPE_REFERENCE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('List')
-                        TYPE_ARGUMENT_LIST
-                          PsiElement(LT)('<')
-                          TYPE_PROJECTION
-                            TYPE_REFERENCE
-                              NULLABLE_TYPE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('Nothing')
-                                PsiElement(QUEST)('?')
-                          PsiElement(GT)('>')
-                  PsiElement(GT)('>')
-        PsiWhiteSpace(' ')
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('B')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`true`')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  CLASS
-    MODIFIER_LIST
-      PsiElement(annotation)('annotation')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('C')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        ANNOTATION_ENTRY
-          PsiElement(AT)('@')
-          ANNOTATION_TARGET
-            PsiElement(property)('property')
-          PsiElement(COLON)(':')
-          CONSTRUCTOR_CALLEE
-            TYPE_REFERENCE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('C')
-        PsiWhiteSpace(' ')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('CharSequence')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-  PsiWhiteSpace('\n\n')
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    TYPE_PARAMETER_LIST
-      PsiElement(LT)('<')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`true`')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      TYPE_PARAMETER
-        PsiElement(IDENTIFIER)('`false`')
-      PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('d')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiElement(COLON)(':')
-    PsiWhiteSpace(' ')
-    TYPE_REFERENCE
-      USER_TYPE
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('Boolean')
-    PsiWhiteSpace('\n        ')
-    PsiElement(where)('where')
-    PsiWhiteSpace(' ')
-    TYPE_CONSTRAINT_LIST
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Any')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Iterable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Collection')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('MutableCollection')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                PsiElement(MUL)('*')
-              PsiElement(GT)('>')
-      PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n              ')
-      TYPE_CONSTRAINT
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace(' ')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Comparable')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_PROJECTION
-                TYPE_REFERENCE
-                  USER_TYPE
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`false`')
-              PsiElement(GT)('>')
-    PsiWhiteSpace(' ')
-    PsiElement(EQ)('=')
-    PsiWhiteSpace(' ')
-    BINARY_EXPRESSION
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-      PsiWhiteSpace(' ')
-      OPERATION_REFERENCE
-        PsiElement(EQEQ)('==')
-      PsiWhiteSpace(' ')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`false`')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
deleted file mode 100644
index f370ef6ee34..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 4
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the fileAnnotationSimple.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-@file:`true`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.txt
deleted file mode 100644
index 37b50e003ab..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.4.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-KtFile: 2.4.kt
-  FILE_ANNOTATION_LIST
-    ANNOTATION_ENTRY
-      PsiElement(AT)('@')
-      ANNOTATION_TARGET
-        PsiElement(file)('file')
-      PsiElement(COLON)(':')
-      CONSTRUCTOR_CALLEE
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
deleted file mode 100644
index 027c5315661..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 5
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageComplex.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-package org.jetbrains.`true`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.txt
deleted file mode 100644
index c941101a9dc..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.5.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-KtFile: 2.5.kt
-  PACKAGE_DIRECTIVE
-    PsiElement(package)('package')
-    PsiWhiteSpace(' ')
-    DOT_QUALIFIED_EXPRESSION
-      DOT_QUALIFIED_EXPRESSION
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('org')
-        PsiElement(DOT)('.')
-        REFERENCE_EXPRESSION
-          PsiElement(IDENTIFIER)('jetbrains')
-      PsiElement(DOT)('.')
-      REFERENCE_EXPRESSION
-        PsiElement(IDENTIFIER)('`true`')
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
deleted file mode 100644
index 7c00c7dc39e..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 6
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the packageSimple.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-package `true`
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.txt
deleted file mode 100644
index 8fa2d6132aa..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.6.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-KtFile: 2.6.kt
-  PACKAGE_DIRECTIVE
-    PsiElement(package)('package')
-    PsiWhiteSpace(' ')
-    REFERENCE_EXPRESSION
-      PsiElement(IDENTIFIER)('`true`')
-  IMPORT_LIST
-    <empty list>
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
deleted file mode 100644
index bea3201b007..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 7
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the enumEntry.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-enum class A(x1: Any?) {
-    `true`("1"),
-    `false`("2");
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.txt
deleted file mode 100644
index df236406c4a..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.7.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-KtFile: 2.7.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    MODIFIER_LIST
-      PsiElement(enum)('enum')
-    PsiWhiteSpace(' ')
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PRIMARY_CONSTRUCTOR
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('x1')
-          PsiElement(COLON)(':')
-          PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            NULLABLE_TYPE
-              USER_TYPE
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('Any')
-              PsiElement(QUEST)('?')
-        PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        PsiElement(IDENTIFIER)('`true`')
-        INITIALIZER_LIST
-          SUPER_TYPE_CALL_ENTRY
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                STRING_TEMPLATE
-                  PsiElement(OPEN_QUOTE)('"')
-                  LITERAL_STRING_TEMPLATE_ENTRY
-                    PsiElement(REGULAR_STRING_PART)('1')
-                  PsiElement(CLOSING_QUOTE)('"')
-              PsiElement(RPAR)(')')
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace('\n    ')
-      ENUM_ENTRY
-        PsiElement(IDENTIFIER)('`false`')
-        INITIALIZER_LIST
-          SUPER_TYPE_CALL_ENTRY
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  ENUM_ENTRY_SUPERCLASS_REFERENCE_EXPRESSION
-                    <empty list>
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                STRING_TEMPLATE
-                  PsiElement(OPEN_QUOTE)('"')
-                  LITERAL_STRING_TEMPLATE_ENTRY
-                    PsiElement(REGULAR_STRING_PART)('2')
-                  PsiElement(CLOSING_QUOTE)('"')
-              PsiElement(RPAR)(')')
-        PsiElement(SEMICOLON)(';')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
deleted file mode 100644
index 1a8e74f388c..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 8
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the stringTemplateElement.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-fun f1() {
-    val x1 = "$`true`"
-
-    val x2 = "..." + "...$`false`..." + "..."
-
-    var x3 = "$`true`$`false`$`true`"
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.txt
deleted file mode 100644
index 2ca5167bb67..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.8.txt
+++ /dev/null
@@ -1,94 +0,0 @@
-KtFile: 2.8.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  FUN
-    PsiElement(fun)('fun')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('f1')
-    VALUE_PARAMETER_LIST
-      PsiElement(LPAR)('(')
-      PsiElement(RPAR)(')')
-    PsiWhiteSpace(' ')
-    BLOCK
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x1')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x2')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        BINARY_EXPRESSION
-          BINARY_EXPRESSION
-            STRING_TEMPLATE
-              PsiElement(OPEN_QUOTE)('"')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              PsiElement(CLOSING_QUOTE)('"')
-            PsiWhiteSpace(' ')
-            OPERATION_REFERENCE
-              PsiElement(PLUS)('+')
-            PsiWhiteSpace(' ')
-            STRING_TEMPLATE
-              PsiElement(OPEN_QUOTE)('"')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              SHORT_STRING_TEMPLATE_ENTRY
-                PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`false`')
-              LITERAL_STRING_TEMPLATE_ENTRY
-                PsiElement(REGULAR_STRING_PART)('...')
-              PsiElement(CLOSING_QUOTE)('"')
-          PsiWhiteSpace(' ')
-          OPERATION_REFERENCE
-            PsiElement(PLUS)('+')
-          PsiWhiteSpace(' ')
-          STRING_TEMPLATE
-            PsiElement(OPEN_QUOTE)('"')
-            LITERAL_STRING_TEMPLATE_ENTRY
-              PsiElement(REGULAR_STRING_PART)('...')
-            PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        PsiElement(var)('var')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('x3')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`false`')
-          SHORT_STRING_TEMPLATE_ENTRY
-            PsiElement(SHORT_TEMPLATE_ENTRY_START)('$')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('`true`')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
deleted file mode 100644
index b6aa0cd437d..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (POSITIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, boolean-literals -> paragraph 1 -> sentence 2
- * NUMBER: 9
- * DESCRIPTION: The use of Boolean literals as the identifier (with backtick) in the unescapedAnnotation.
- * NOTE: this test data is generated by FeatureInteractionTestDataGenerator. DO NOT MODIFY CODE MANUALLY!
- */
-
-class A {
-    @field:`true`
-    val a: Int = ""
-
-    @setparam:`false`(`true`)
-    val b: Int = ""
-
-    @receiver:org.jetbrains.`false`<A<B, C>>(`true`)
-    val c: Int = ""
-
-    @org.jetbrains.`false`
-    val c: Int = ""
-
-    @`true`<A<B>, C>(`false`, `true`, `false`)
-    val c: Int = ""
-
-    @`true`
-    val c: Int = ""
-
-    @`false`.`true`.`false`<A<B>, C>(`true`, `false`, `true`)
-    val c: Int = ""
-}
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.txt b/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.txt
deleted file mode 100644
index 375f01e4893..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/boolean-literals/p-1/pos/2.9.txt
+++ /dev/null
@@ -1,342 +0,0 @@
-KtFile: 2.9.kt
-  PACKAGE_DIRECTIVE
-    <empty list>
-  IMPORT_LIST
-    <empty list>
-  CLASS
-    PsiElement(class)('class')
-    PsiWhiteSpace(' ')
-    PsiElement(IDENTIFIER)('A')
-    PsiWhiteSpace(' ')
-    CLASS_BODY
-      PsiElement(LBRACE)('{')
-      PsiWhiteSpace('\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            ANNOTATION_TARGET
-              PsiElement(field)('field')
-            PsiElement(COLON)(':')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('a')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            ANNOTATION_TARGET
-              PsiElement(setparam)('setparam')
-            PsiElement(COLON)(':')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`false`')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('b')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            ANNOTATION_TARGET
-              PsiElement(receiver)('receiver')
-            PsiElement(COLON)(':')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('org')
-                    PsiElement(DOT)('.')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('jetbrains')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`false`')
-                  TYPE_ARGUMENT_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('A')
-                          TYPE_ARGUMENT_LIST
-                            PsiElement(LT)('<')
-                            TYPE_PROJECTION
-                              TYPE_REFERENCE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('B')
-                            PsiElement(COMMA)(',')
-                            PsiWhiteSpace(' ')
-                            TYPE_PROJECTION
-                              TYPE_REFERENCE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('C')
-                            PsiElement(GT)('>')
-                    PsiElement(GT)('>')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('org')
-                    PsiElement(DOT)('.')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('jetbrains')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`false`')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`true`')
-                  TYPE_ARGUMENT_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('A')
-                          TYPE_ARGUMENT_LIST
-                            PsiElement(LT)('<')
-                            TYPE_PROJECTION
-                              TYPE_REFERENCE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('B')
-                            PsiElement(GT)('>')
-                    PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('C')
-                    PsiElement(GT)('>')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`false`')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`false`')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`true`')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n\n    ')
-      PROPERTY
-        MODIFIER_LIST
-          ANNOTATION_ENTRY
-            PsiElement(AT)('@')
-            CONSTRUCTOR_CALLEE
-              TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('`false`')
-                    PsiElement(DOT)('.')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('`true`')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('`false`')
-                  TYPE_ARGUMENT_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('A')
-                          TYPE_ARGUMENT_LIST
-                            PsiElement(LT)('<')
-                            TYPE_PROJECTION
-                              TYPE_REFERENCE
-                                USER_TYPE
-                                  REFERENCE_EXPRESSION
-                                    PsiElement(IDENTIFIER)('B')
-                            PsiElement(GT)('>')
-                    PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('C')
-                    PsiElement(GT)('>')
-            VALUE_ARGUMENT_LIST
-              PsiElement(LPAR)('(')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`false`')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              VALUE_ARGUMENT
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('`true`')
-              PsiElement(RPAR)(')')
-        PsiWhiteSpace('\n    ')
-        PsiElement(val)('val')
-        PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('c')
-        PsiElement(COLON)(':')
-        PsiWhiteSpace(' ')
-        TYPE_REFERENCE
-          USER_TYPE
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('Int')
-        PsiWhiteSpace(' ')
-        PsiElement(EQ)('=')
-        PsiWhiteSpace(' ')
-        STRING_TEMPLATE
-          PsiElement(OPEN_QUOTE)('"')
-          PsiElement(CLOSING_QUOTE)('"')
-      PsiWhiteSpace('\n')
-      PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
deleted file mode 100644
index e40e7d52ca4..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 2 -> sentence 1
- * NUMBER: 1
- * DESCRIPTION: Integer literals with 0 in the first position and it contains more than 1 digit.
- */
-
-val value = 00
-val value = 000000
-val value = 010000
-val value = 01000100
-val value = 099999999
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
deleted file mode 100644
index 6a9260d4b1f..00000000000
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * KOTLIN PSI SPEC TEST (NEGATIVE)
- *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 2 -> sentence 1
- * NUMBER: 2
- * DESCRIPTION: Integer literals with 0 in the first position and it contains more than 1 digit separated by underscore.
- */
-
-val value = 0_0
-val value = 000_000
-val value = 0_10000
-val value = 0_1000100
-val value = 0_99999999
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
similarity index 82%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
index ca0f178af66..9af36bb6564 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with invalid or double prefixes.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
similarity index 83%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
index c1d9e246cf5..c32d8984b52 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with not allowed symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
similarity index 76%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
index 91f921c7a2b..ba4cf36bf06 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with underscore breaking the prefix (in it).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/neg/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
index 9c3c1089b31..12a8aebfcc3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with valid digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
similarity index 62%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
index 67a2f685269..bce2b2d874c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with invalid [2-9] digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
similarity index 55%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
index caa2a7ff902..17276ffba29 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with prefix only (without digit symbols).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
index 89271063625..2b6d991aa93 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Binary integer literals with underscore symbols in valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
similarity index 64%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
index 0fd5ebb84e9..712caf55927 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Binary integer literals with underscore symbols after binary prefix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
similarity index 69%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
index 5a2b785539b..e62e249952b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Binary integer literals with underscore symbol after the last digit.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
similarity index 76%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
index 6fbf460eee5..887cf761f4f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, binary-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Binary integer literals with underscore symbol before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/p-1/pos/2.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
new file mode 100644
index 00000000000..7ce4563a1ed
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/binary-integer-literals/testsMap.json
@@ -0,0 +1,76 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscore breaking the prefix (in it).",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with not allowed symbols.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with invalid or double prefixes.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscore symbols in valid places.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscore symbol before the first digit (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscore symbol after the last digit.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscore symbols after binary prefix.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with invalid [2-9] digit symbols.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with prefix only (without digit symbols).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with valid digit symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
index a1d5ec63ae5..9ba856dae1a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with not all decimal digit symbols
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
similarity index 85%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
index b529f4fbce5..3ca95ec1100 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Sequences with decimal digit symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
similarity index 78%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
index 40ca3c0ecd4..8820ed678f9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Integers with underscore symbols in the valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
similarity index 74%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
index 8b8ea4abf71..83ed8f7144f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Integers with underscore symbol in the last position.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
similarity index 78%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
index e1195d86e50..bd2a7ab91c4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, decimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Integers with underscore symbols before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-1/pos/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/p-2/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..44d3e5db00a
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/decimal-integer-literals/testsMap.json
@@ -0,0 +1,44 @@
+{
+  "1": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with not all decimal digit symbols",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Integers with underscore symbols in the valid places.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Integers with underscore symbols before the first digit (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Integers with underscore symbol in the last position.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Sequences with decimal digit symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
index a2cb33e0a2a..1987b0b1ba2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with invalid or double prefixes.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
index 840ff644290..8f7e1082d50 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with not allowed symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
similarity index 75%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
index ca40e3b93f1..377f0dea01c 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with underscore breaking the prefix (in it).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/neg/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
similarity index 90%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
index 33cd5ca3558..0afce4897f9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with valid symbols.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
similarity index 55%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
index d546cc0625d..16018bfb7b3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with prefix only (without digit symbols).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
index 70157f1a59d..c1f2af731c1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Hexadecimal integer literals with underscore symbols in valid places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
similarity index 64%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
index e146961ac07..18a1021fd64 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Hexadecimal integer literals with underscore symbols after hexadecimal prefix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
similarity index 69%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
index 877e9e1fac9..b491b2f4333 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Hexadecimal integer literals with underscore symbol after the last digit.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
similarity index 75%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
index aeb0b2c6d3f..d017f4e9b9b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, integer-literals, hexadecimal-integer-literals -> paragraph 1 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Hexadecimal integer literals with underscore symbol before the first digit (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/p-1/pos/2.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
new file mode 100644
index 00000000000..8df10d7edd2
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/integer-literals/hexadecimal-integer-literals/testsMap.json
@@ -0,0 +1,70 @@
+{
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscore breaking the prefix (in it).",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with not allowed symbols.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with invalid or double prefixes.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscore symbols in valid places.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscore symbol before the first digit (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscore symbol after the last digit.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscore symbols after hexadecimal prefix.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with prefix only (without digit symbols).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with valid symbols.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
similarity index 95%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
index 17b991fe208..2dddbacf1f3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with not allowed several dots.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.2.kt
similarity index 83%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.2.kt
index b72e80e9d53..ff30c0474ca 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with not allowed symbols as a separator of a whole-number part and a fraction part.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.3.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.3.kt
index 3c4de9929d5..da55f5051d3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals separeted by comments.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.1.kt
similarity index 95%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.1.kt
index e233366e285..2f9519b9376 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Not allowed hexadecimal real literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.2.kt
similarity index 95%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.2.kt
index 7a66bc3a157..9fedb2ebaa8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Not allowed binary real literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.3.kt
similarity index 94%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.3.kt
index e19197421ab..206c9700c40 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Not allowed real literals with a whole-number part as a hexadecimal number and a fraction part as a binary number (or vice versa).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
similarity index 94%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
index f91c2c7139c..168c2075074 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: A float suffix in the real literals right after a dot.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.2.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.2.kt
index d55264c2c8e..7cb63883dd7 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: A float suffix in the real literals right after a several dots (possibly separated by digits).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.3.kt
similarity index 84%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.3.kt
index 7678a9c827e..74eee6ca2d4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 3
  * DESCRIPTION: Real literals with a float suffix and not allowed symbols as a separator of a whole-number part and a fraction part.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/neg/3.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/neg/3.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
similarity index 89%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
index 297a09cccc9..626210c853b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
similarity index 99%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
index eefb0cf468c..ae9fdbe7ca2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a many digits in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
similarity index 90%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
index 19a88493ddb..cbab414f1d6 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
similarity index 98%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
index 170e023a9e3..4fab786e97a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 1 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-1/pos/3.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-1/pos/3.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
similarity index 88%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
index 913296694a2..f76b975279b 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
similarity index 88%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
index 4914b4ecfae..d9404bd22a4 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (the float suffix) with not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
index 6371e798337..ad83c4b1812 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with a not allowed exponent mark with digits followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
index cc473433505..29c5e1d70e3 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with a not allowed digits and exponent mark followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/neg/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/neg/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
index 073eb288c37..7e1e7218533 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
similarity index 77%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
index 190db5d6e91..b411fc39aa1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.3.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.3.kt
index 23067db1e00..f213b32722d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals without digits after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.4.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.4.kt
index e9d5f2c82bf..7e23b6af145 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Simple real literals suffixed by f/F (float suffix) with an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.5.kt
similarity index 79%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.5.kt
index 7706b5a292a..d9ffc061a1e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.5.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.5.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.5.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.6.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.6.kt
index b7a6797b2b0..1f7a37c6547 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.6.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 2 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 2 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.6.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-2/pos/1.6.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-2/pos/1.6.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
index be821e161b7..c4a9c6a6d76 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals consisting only of dots or many dots before digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
similarity index 74%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
index fdee36b1eeb..7239c0713cf 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with dots at the beginning and exponent mark/float suffix right after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.3.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.3.kt
index a1cc9dfbbc5..e1f8a3d86f8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted whole-number part and not allowed several exponent marks.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.4.kt
similarity index 80%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.4.kt
index 01e89def758..f7006c2930f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted whole-number part and an exponent mark followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.5.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.5.kt
index 9dffe83ad3a..6b63b590d24 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with omitted whole-number part and an exponent mark followed by a float suffix and digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.5.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/1.5.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/1.5.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
similarity index 83%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
index 5f8398bca6b..ef579346729 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with omitted fraction part and digits followed by a float suffix.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/3.1.kt
similarity index 94%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/3.1.kt
index c83b1598ac5..43d75dc09d7 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Real literals with a not allowed dot at the end.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/neg/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/neg/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
index edb85cd43ff..16a59683ed7 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
similarity index 95%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
index e1fecf2be0a..d210a5d6be9 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
index c94a66a7320..53632cae973 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a whole-number part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
index 7a73a840241..0857403ccde 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Simple real literals suffixed by f/F (float suffix) with omitted a whole-number part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
similarity index 96%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
index 9454a90700a..fd483fb5f64 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.5.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.5.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.6.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.6.kt
index b55c3ad30f5..711fa607b64 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.6.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.6.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/1.6.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/1.6.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
similarity index 85%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
index c7d066241b2..1bdaaeb2920 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
index a87c948ac5a..eca91c3a9c8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
index 79f75e8f1b4..e785c2dec44 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.4.kt
similarity index 76%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.4.kt
index 0f322796c07..17882d0f2ca 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 3 -> sentence 2
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted a fraction part and an exponent mark without digits after it.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-3/pos/2.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-3/pos/2.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
index 3a276e2dae6..72cd02d9781 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with a not allowed underscore at the beginning.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
similarity index 94%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
index 726d6ec2f05..53c8db2020d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals with dots separated by underscores.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.3.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.3.kt
index 8e5cb56a4e3..2ce9469ad74 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals with float suffix not at the end and underscores at the different positions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.4.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.4.kt
index 89d27dc1ae6..070c2ca1819 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with omitted whole-number part, float suffix not at the end and underscores at the different positions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/neg/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/neg/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
index fad95b87b91..e9fcdae7997 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
index 70e49d69731..76f91659d15 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
similarity index 94%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
index 4462d3a0ab2..e0c74b372b0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
index 454912ddc80..1050fcd933d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
similarity index 95%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
index 86b9ad615af..3584ba99cc5 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.5.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.5.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.6.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.6.kt
index a721d808a67..cef82610ba2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.6.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Real literals without digits after an exponent mark and with undescores in the different pisitions.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.6.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.6.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.6.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.7.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.7.kt
index e4f144f6019..13932fcead2 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.7.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 1
  * NUMBER: 7
  * DESCRIPTION: Real literals with underscores at the end.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.7.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/1.7.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/1.7.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.1.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.1.kt
index 4f2ad602615..9eb831ef69e 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: Real literals with underscores before an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.2.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.2.kt
index 5779f85f689..db7fb6d3252 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: Real literals with underscores after an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.3.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.3.kt
index 52b058f118c..bf33756b921 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 4 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 4 -> sentence 2
  * NUMBER: 3
  * DESCRIPTION: Real literals with underscores around an exponent mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-4/pos/2.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-4/pos/2.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-6/neg/1.1.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-6/neg/1.1.kt
index 8ff05f42851..935a6f74870 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-6/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, real-literals -> paragraph 6 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, real-literals -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Real literals suffixed by not supported d/D (a double suffix).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-6/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/real-literals/p-6/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/p-6/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/testsMap.json
new file mode 100644
index 00000000000..4ed323fd16b
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/real-literals/testsMap.json
@@ -0,0 +1,392 @@
+{
+  "6": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by not supported d/D (a double suffix).",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "1": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Not allowed hexadecimal real literals.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Not allowed real literals with a whole-number part as a hexadecimal number and a fraction part as a binary number (or vice versa).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Not allowed binary real literals.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with not allowed symbols as a separator of a whole-number part and a fraction part.",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals separeted by comments.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with not allowed several dots.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "A float suffix in the real literals right after a dot.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "A float suffix in the real literals right after a several dots (possibly separated by digits).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a float suffix and not allowed symbols as a separator of a whole-number part and a fraction part.",
+          "unexpectedBehaviour": true
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a many digits in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals suffixed by f/F (the float suffix) with a different whole-number part and fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (the float suffix) with a many digits in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "4": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with dots separated by underscores.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with float suffix not at the end and underscores at the different positions.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted whole-number part, float suffix not at the end and underscores at the different positions.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a not allowed underscore at the beginning.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals without digits after an exponent mark and with undescores in the different pisitions.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores at the end.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with an omitted whole-number part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with an omitted fraction part and underscores in a whole-number part, a fraction part and an exponent part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores in a whole-number part and a fraction part.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores before an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores around an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with underscores after an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "3": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted fraction part and digits followed by a float suffix.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with dots at the beginning and exponent mark/float suffix right after it.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted whole-number part and not allowed several exponent marks.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted whole-number part and an exponent mark followed by a float suffix.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted whole-number part and an exponent mark followed by a float suffix and digits.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals consisting only of dots or many dots before digits.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a not allowed dot at the end.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a whole-number part, suffixed by f/F (float suffix) followed by an exponent mark without digits.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a whole-number part and an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals suffixed by f/F (float suffix) with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with omitted a whole-number part and an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with omitted a whole-number part.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with omitted a fraction part, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a fraction part and an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a fraction part and an exponent mark, suffixed by f/F (float suffix).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with omitted a fraction part and an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (the float suffix) with not allowed several exponent marks.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a not allowed exponent mark with digits followed by a float suffix.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a not allowed digits and exponent mark followed by a float suffix.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with not allowed several exponent marks.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with an exponent mark without digits after it.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals with a not allowed exponent mark at the beginning.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals without digits after an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals suffixed by f/F (float suffix) with an exponent mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Real literals suffixed by f/F (float suffix) with a not allowed exponent mark at the beginning.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Simple real literals with an exponent mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
similarity index 68%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
index a90dc7f3fe7..05f342db52a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Various integer literals with a long literal mark doublicate.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
similarity index 77%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
index f915ba4aaae..d81d8758d71 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Various integer literals with a long literal mark in not allowed places.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
similarity index 67%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
index a0f305992c1..067d3f1f290 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Various integer literals with underscores after a long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.4.kt
similarity index 60%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.4.kt
index 2b457095c43..341fcf28ac1 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: The long literal mark after not integer literals.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/neg/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/neg/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
similarity index 86%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
index 6eef1c6b14a..b6a7e9b3f67 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: Decimal integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.10.kt
similarity index 63%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.10.kt
index 4ac9be9879a..9f32f02bed8 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.10.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 10
  * DESCRIPTION: Long literal mark in not allowed places (it's considered as identifiers).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.10.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.10.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.10.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
similarity index 86%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
index 6ed5b590c3d..56f591651ea 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: Decimal integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
similarity index 92%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
index 61205fabc05..4410db6c604 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: Hexadecimal integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.4.kt
similarity index 56%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.4.kt
index 75c7cebcfdb..107f2ff13dc 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.4.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 4
  * DESCRIPTION: Hexadecimal prefix only suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.4.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.4.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.4.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.5.kt
similarity index 88%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.5.kt
index 38c10a2909c..9bbb1e355c0 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.5.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 5
  * DESCRIPTION: Hexadecimal integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.5.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.5.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.5.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.6.kt
similarity index 93%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.6.kt
index c25c0fd2460..268f325159f 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.6.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 6
  * DESCRIPTION: Binary integer literals suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.6.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.6.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.6.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.7.kt
similarity index 55%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.7.kt
index cbfccfddc6d..0aa1f7dce62 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.7.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 7
  * DESCRIPTION: Binary prefix only suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.7.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.7.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.7.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.8.kt
similarity index 91%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.8.kt
index 71bebb30f7d..59a3e3c9a1d 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.8.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 8
  * DESCRIPTION: Binary integer literals with underscores suffixed by the long literal mark.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.8.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.8.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.8.txt
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.9.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.9.kt
index a390e5e2d02..4c412705e4a 100644
--- a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.9.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: constant-literals, integer-literals, long-integer-literals -> paragraph 1 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, constant-literals, the-types-for-integer-literals -> paragraph 1 -> sentence 1
  * NUMBER: 9
  * DESCRIPTION: Various integer literals with long literal mark in not allowed lower case (but valid in opinion the parser).
  */
diff --git a/compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.txt b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.9.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/constant-literals/integer-literals/long-integer-literals/p-1/pos/1.9.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/p-1/pos/1.9.txt
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
new file mode 100644
index 00000000000..148620bc25c
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/constant-literals/the-types-for-integer-literals/testsMap.json
@@ -0,0 +1,96 @@
+{
+  "1": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Various integer literals with a long literal mark in not allowed places.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Various integer literals with underscores after a long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "The long literal mark after not integer literals.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Various integer literals with a long literal mark doublicate.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Decimal integer literals with underscores suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary prefix only suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Long literal mark in not allowed places (it\u0027s considered as identifiers).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Binary integer literals with underscores suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Various integer literals with long literal mark in not allowed lower case (but valid in opinion the parser).",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal prefix only suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Hexadecimal integer literals with underscores suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Decimal integer literals suffixed by the long literal mark.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.1.kt
similarity index 60%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.1.kt
index 4a95048a14e..a7c638dfe16 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty 'when' with missed bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.2.kt
similarity index 65%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.2.kt
index 0d3c247eb28..9bb28f2f3b3 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty 'when' with missed 'when entries' section.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/neg/3.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/neg/3.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.1.kt
similarity index 60%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.1.kt
index fdad70fe326..69a01e41129 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: Empty 'when' with bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.2.kt
similarity index 59%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.2.kt
index b3ea6604f92..18f6794e547 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (POSITIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 2 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 1 -> sentence 3
  * NUMBER: 2
  * DESCRIPTION: Empty 'when' without bound value.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-2/pos/3.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-1/pos/3.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.1.kt
similarity index 67%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.1.kt
index 89232632c37..742c5290ea5 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and missed control structure body.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.2.kt
similarity index 67%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.2.kt
index 886c8480c8b..fa6ede578a6 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 3 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and missed 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.1.kt
similarity index 81%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.1.kt
index eb500c1d425..850b27200ab 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 1
  * DESCRIPTION: 'When' without bound value and with invalid 'else' branch.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt
similarity index 90%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt
index 35c45b2d9b2..786e6faf87c 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 3 -> sentence 2
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 2 -> sentence 2
  * NUMBER: 2
  * DESCRIPTION: 'When' without bound value and with invalid list of the boolean conditions in 'when entry'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-3/neg/2.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-2/neg/2.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.1.kt
similarity index 66%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.1.kt
index d184e0fa8b4..05fa37724a2 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 6 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and empty control structure body.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.2.kt
similarity index 67%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.2.kt
index ab8a565bed2..71c4061d958 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 6 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and empty 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt
similarity index 83%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt
index ec58f81432b..a136e95c999 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 6 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 5 -> sentence 1
  * NUMBER: 3
  * DESCRIPTION: 'When' with bound value and with invalid list of the conditions in 'when entry'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-6/neg/1.3.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-5/neg/1.3.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.1.kt
similarity index 76%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.1.kt
index edb88a11ce9..13bddfa10d3 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and type test condition, but missed type in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.exceptions.compiler.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.exceptions.compiler.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.exceptions.compiler.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.exceptions.compiler.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.kt
similarity index 87%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.kt
index a60c3f2c9d4..6d524bf5530 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 7 -> sentence 1
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 1
  * NUMBER: 2
  * DESCRIPTION: 'When' with bound value and 'when condition' with type checking operator and non-type value.
  * UNEXPECTED BEHAVIOUR
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/1.2.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/1.2.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.kt
similarity index 80%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.kt
index 4fa8c16e54f..c6210ad510a 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 7 -> sentence 7
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 11
  * NUMBER: 1
  * DESCRIPTION: 'When' with invalid else condition.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.txt
similarity index 99%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.txt
index 5132f93b5db..67b389a878d 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/7.1.txt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/11.1.txt
@@ -1,4 +1,4 @@
-KtFile: 7.1.kt
+KtFile: 11.1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/3.1.kt
similarity index 77%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/3.1.kt
index 31eec2d44ca..654af0bf587 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/3.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 7 -> sentence 3
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 3
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and 'when condition' with range expression, but without contains operator.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/3.1.txt
similarity index 100%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/3.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/3.1.txt
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.kt
similarity index 77%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.kt
index eb0eef47a73..253855d3e51 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.kt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.kt
@@ -1,8 +1,8 @@
 /*
  * KOTLIN PSI SPEC TEST (NEGATIVE)
  *
- * SPEC VERSION: 0.1-draft
- * PLACE: when-expression -> paragraph 7 -> sentence 5
+ * SPEC VERSION: 0.1-100
+ * PLACE: expressions, when-expression -> paragraph 6 -> sentence 8
  * NUMBER: 1
  * DESCRIPTION: 'When' with bound value and not allowed spread operator in 'when condition'.
  */
diff --git a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.txt b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.txt
similarity index 99%
rename from compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.txt
rename to compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.txt
index 0d65c3d3aed..2fcc4b1e3cb 100644
--- a/compiler/tests-spec/testData/psi/linked/when-expression/p-7/neg/5.1.txt
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/p-6/neg/8.1.txt
@@ -1,4 +1,4 @@
-KtFile: 5.1.kt
+KtFile: 8.1.kt
   PACKAGE_DIRECTIVE
     <empty list>
   IMPORT_LIST
diff --git a/compiler/tests-spec/testData/psi/linked/expressions/when-expression/testsMap.json b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/testsMap.json
new file mode 100644
index 00000000000..9b270149238
--- /dev/null
+++ b/compiler/tests-spec/testData/psi/linked/expressions/when-expression/testsMap.json
@@ -0,0 +1,134 @@
+{
+  "6": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with type checking operator and non-type value.",
+          "unexpectedBehaviour": true
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and type test condition, but missed type in \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and \u0027when condition\u0027 with range expression, but without contains operator.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "8": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and not allowed spread operator in \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "11": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with invalid else condition.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "1": {
+    "neg": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Empty \u0027when\u0027 with missed bound value.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Empty \u0027when\u0027 with missed \u0027when entries\u0027 section.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    },
+    "pos": {
+      "3": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Empty \u0027when\u0027 with bound value.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "Empty \u0027when\u0027 without bound value.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "2": {
+    "neg": {
+      "2": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 without bound value and with invalid \u0027else\u0027 branch.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 without bound value and with invalid list of the boolean conditions in \u0027when entry\u0027.",
+          "unexpectedBehaviour": false
+        }
+      ],
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 without bound value and missed \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 without bound value and missed control structure body.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  },
+  "5": {
+    "neg": {
+      "1": [
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and empty \u0027when condition\u0027.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and with invalid list of the conditions in \u0027when entry\u0027.",
+          "unexpectedBehaviour": false
+        },
+        {
+          "specVersion": "0.1-100",
+          "casesNumber": 0,
+          "description": "\u0027When\u0027 with bound value and empty control structure body.",
+          "unexpectedBehaviour": false
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java
index 12df59cec65..a7a240f5faa 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/DiagnosticsTestSpecGenerated.java
@@ -53,19 +53,6 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                 KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
             }
 
-            @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Conditional_expression extends AbstractDiagnosticsTestSpec {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInConditional_expression() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/expressions/conditional-expression"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-                }
-            }
-
             @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -1398,19 +1385,19 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                     }
 
-                    @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any")
+                    @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any")
                     @TestDataPath("$PROJECT_ROOT")
                     @RunWith(JUnit3RunnerWithInners.class)
-                    public static class Kotlin_Any extends AbstractDiagnosticsTestSpec {
+                    public static class Kotlin_any extends AbstractDiagnosticsTestSpec {
                         private void runTest(String testDataFilePath) throws Exception {
                             KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
                         }
 
-                        public void testAllFilesPresentInKotlin_Any() throws Exception {
-                            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                        public void testAllFilesPresentInKotlin_any() throws Exception {
+                            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                         }
 
-                        @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1")
+                        @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1")
                         @TestDataPath("$PROJECT_ROOT")
                         @RunWith(JUnit3RunnerWithInners.class)
                         public static class P_1 extends AbstractDiagnosticsTestSpec {
@@ -1419,10 +1406,10 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
                             }
 
                             public void testAllFilesPresentInP_1() throws Exception {
-                                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                             }
 
-                            @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1/pos")
+                            @TestMetadata("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos")
                             @TestDataPath("$PROJECT_ROOT")
                             @RunWith(JUnit3RunnerWithInners.class)
                             public static class Pos extends AbstractDiagnosticsTestSpec {
@@ -1432,16 +1419,16 @@ public class DiagnosticsTestSpecGenerated extends AbstractDiagnosticsTestSpec {
 
                                 @TestMetadata("1.1.kt")
                                 public void test1_1() throws Exception {
-                                    runTest("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1/pos/1.1.kt");
+                                    runTest("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.1.kt");
                                 }
 
                                 @TestMetadata("1.2.kt")
                                 public void test1_2() throws Exception {
-                                    runTest("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1/pos/1.2.kt");
+                                    runTest("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos/1.2.kt");
                                 }
 
                                 public void testAllFilesPresentInPos() throws Exception {
-                                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.Any/p-1/pos"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
+                                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/diagnostics/linked/type-system/type-kinds/built-in-types/kotlin.any/p-1/pos"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
                                 }
                             }
                         }
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java
index 1baac63cecb..517d399842c 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/codegen/BlackBoxCodegenTestSpecGenerated.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.spec.codegen;
@@ -41,45 +41,6 @@ public class BlackBoxCodegenTestSpecGenerated extends AbstractBlackBoxCodegenTes
             KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
         }
 
-        @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/constant-literals")
-        @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Constant_literals extends AbstractBlackBoxCodegenTestSpec {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-            }
-
-            public void testAllFilesPresentInConstant_literals() throws Exception {
-                KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/constant-literals"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-            }
-
-            @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Boolean_literals extends AbstractBlackBoxCodegenTestSpec {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInBoolean_literals() throws Exception {
-                    KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-                }
-
-                @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1")
-                @TestDataPath("$PROJECT_ROOT")
-                @RunWith(JUnit3RunnerWithInners.class)
-                public static class P_1 extends AbstractBlackBoxCodegenTestSpec {
-                    private void runTest(String testDataFilePath) throws Exception {
-                        KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
-                    }
-
-                    public void testAllFilesPresentInP_1() throws Exception {
-                        KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/tests-spec/testData/codegen/box/linked/constant-literals/boolean-literals/p-1"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true);
-                    }
-                }
-            }
-        }
-
         @TestMetadata("compiler/tests-spec/testData/codegen/box/linked/expressions")
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java
index 33fd54923ed..584afafd769 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/parsing/ParsingTestSpecGenerated.java
@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.spec.parsing;