diff --git a/compiler/testData/psi/SimpleModifiers.kt b/compiler/testData/psi/SimpleModifiers.kt
index fecd6d63580..31ba846daaa 100644
--- a/compiler/testData/psi/SimpleModifiers.kt
+++ b/compiler/testData/psi/SimpleModifiers.kt
@@ -13,7 +13,6 @@ public
 internal
 in
 out
-ref
  class Bar<abstract
         open
         enum
@@ -28,7 +27,7 @@ ref
         internal
         in
         out
-        ref T> {
+        T> {
     val abstract
     val open
     val enum
diff --git a/compiler/testData/psi/SimpleModifiers.txt b/compiler/testData/psi/SimpleModifiers.txt
index b9e3e4aa807..946c5cbd249 100644
--- a/compiler/testData/psi/SimpleModifiers.txt
+++ b/compiler/testData/psi/SimpleModifiers.txt
@@ -15,37 +15,34 @@ JetFile: SimpleModifiers.kt
   IMPORT_LIST
     <empty list>
   PsiWhiteSpace('\n\n')
-  MODIFIER_LIST
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(annotation)('annotation')
-    PsiWhiteSpace('\n')
-    PsiElement(override)('override')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(private)('private')
-    PsiWhiteSpace('\n')
-    PsiElement(protected)('protected')
-    PsiWhiteSpace('\n')
-    PsiElement(public)('public')
-    PsiWhiteSpace('\n')
-    PsiElement(internal)('internal')
-    PsiWhiteSpace('\n')
-    PsiElement(in)('in')
-    PsiWhiteSpace('\n')
-    PsiElement(out)('out')
-  PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('ref')
-  PsiWhiteSpace('\n ')
   CLASS
+    MODIFIER_LIST
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(annotation)('annotation')
+      PsiWhiteSpace('\n')
+      PsiElement(override)('override')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(private)('private')
+      PsiWhiteSpace('\n')
+      PsiElement(protected)('protected')
+      PsiWhiteSpace('\n')
+      PsiElement(public)('public')
+      PsiWhiteSpace('\n')
+      PsiElement(internal)('internal')
+      PsiWhiteSpace('\n')
+      PsiElement(in)('in')
+      PsiWhiteSpace('\n')
+      PsiElement(out)('out')
+    PsiWhiteSpace('\n ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Bar')
@@ -81,17 +78,10 @@ JetFile: SimpleModifiers.kt
           PsiWhiteSpace('\n        ')
           PsiElement(out)('out')
         PsiWhiteSpace('\n        ')
-        PsiElement(IDENTIFIER)('ref')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Missing '>'
         PsiElement(IDENTIFIER)('T')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n    ')
       PROPERTY
diff --git a/compiler/testData/psi/SoftKeywords.kt b/compiler/testData/psi/SoftKeywords.kt
index b397be497c2..2c43a406401 100644
--- a/compiler/testData/psi/SoftKeywords.kt
+++ b/compiler/testData/psi/SoftKeywords.kt
@@ -16,7 +16,6 @@ public
 internal
 in
 out
-ref
  class Bar<abstract, abstract enum : T, out open,
     public protected private internal abstract
     open
diff --git a/compiler/testData/psi/SoftKeywords.txt b/compiler/testData/psi/SoftKeywords.txt
index 748cfc5c25c..0a0d1a8b375 100644
--- a/compiler/testData/psi/SoftKeywords.txt
+++ b/compiler/testData/psi/SoftKeywords.txt
@@ -20,45 +20,42 @@ JetFile: SoftKeywords.kt
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('foo')
   PsiWhiteSpace('\n\n')
-  MODIFIER_LIST
-    PsiElement(public)('public')
-    PsiWhiteSpace(' ')
-    PsiElement(protected)('protected')
-    PsiWhiteSpace(' ')
-    PsiElement(private)('private')
-    PsiWhiteSpace(' ')
-    PsiElement(internal)('internal')
-    PsiWhiteSpace('\n')
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(annotation)('annotation')
-    PsiWhiteSpace('\n')
-    PsiElement(override)('override')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(private)('private')
-    PsiWhiteSpace('\n')
-    PsiElement(protected)('protected')
-    PsiWhiteSpace('\n')
-    PsiElement(public)('public')
-    PsiWhiteSpace('\n')
-    PsiElement(internal)('internal')
-    PsiWhiteSpace('\n')
-    PsiElement(in)('in')
-    PsiWhiteSpace('\n')
-    PsiElement(out)('out')
-  PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('ref')
-  PsiWhiteSpace('\n ')
   CLASS
+    MODIFIER_LIST
+      PsiElement(public)('public')
+      PsiWhiteSpace(' ')
+      PsiElement(protected)('protected')
+      PsiWhiteSpace(' ')
+      PsiElement(private)('private')
+      PsiWhiteSpace(' ')
+      PsiElement(internal)('internal')
+      PsiWhiteSpace('\n')
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(annotation)('annotation')
+      PsiWhiteSpace('\n')
+      PsiElement(override)('override')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(private)('private')
+      PsiWhiteSpace('\n')
+      PsiElement(protected)('protected')
+      PsiWhiteSpace('\n')
+      PsiElement(public)('public')
+      PsiWhiteSpace('\n')
+      PsiElement(internal)('internal')
+      PsiWhiteSpace('\n')
+      PsiElement(in)('in')
+      PsiWhiteSpace('\n')
+      PsiElement(out)('out')
+    PsiWhiteSpace('\n ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Bar')
diff --git a/compiler/testData/psi/annotation/Annotations.kt b/compiler/testData/psi/annotation/Annotations.kt
index 5acb371bf14..e7866b0bd13 100644
--- a/compiler/testData/psi/annotation/Annotations.kt
+++ b/compiler/testData/psi/annotation/Annotations.kt
@@ -17,7 +17,6 @@ internal
 in
 @[sdfsdf]
 out
-ref
  class Bar<abstract
 open
 @[sdfsdf(1+1) a]
@@ -36,5 +35,5 @@ public
 internal
 in
 out
-ref T> {
+T> {
 }
diff --git a/compiler/testData/psi/annotation/Annotations.txt b/compiler/testData/psi/annotation/Annotations.txt
index ba9a06ea3a2..449b7f94aaf 100644
--- a/compiler/testData/psi/annotation/Annotations.txt
+++ b/compiler/testData/psi/annotation/Annotations.txt
@@ -15,103 +15,39 @@ JetFile: Annotations.kt
   IMPORT_LIST
     <empty list>
   PsiWhiteSpace('\n\n')
-  MODIFIER_LIST
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(enum)('enum')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(annotation)('annotation')
-    PsiWhiteSpace('\n')
-    PsiElement(override)('override')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(private)('private')
-    PsiWhiteSpace('\n')
-    PsiElement(protected)('protected')
-    PsiWhiteSpace('\n')
-    PsiElement(public)('public')
-    PsiWhiteSpace('\n')
-    PsiElement(internal)('internal')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-              TYPE_ARGUMENT_LIST
-                PsiElement(LT)('<')
-                TYPE_PROJECTION
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('A')
-                PsiElement(COMMA)(',')
-                PsiWhiteSpace(' ')
-                TYPE_PROJECTION
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('B')
-                PsiElement(GT)('>')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace(' ')
-          VALUE_ARGUMENT
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('b')
-          PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('ina')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
+  CLASS
+    MODIFIER_LIST
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(enum)('enum')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(annotation)('annotation')
+      PsiWhiteSpace('\n')
+      PsiElement(override)('override')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(private)('private')
+      PsiWhiteSpace('\n')
+      PsiElement(protected)('protected')
+      PsiWhiteSpace('\n')
+      PsiElement(public)('public')
+      PsiWhiteSpace('\n')
+      PsiElement(internal)('internal')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
               USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('foo')
-                      PsiElement(DOT)('.')
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('bar')
-                    PsiElement(DOT)('.')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('goo')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('doo')
-                  TYPE_ARGUMENT_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('f')
-                    PsiElement(GT)('>')
-                PsiElement(DOT)('.')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
                 TYPE_ARGUMENT_LIST
@@ -120,50 +56,111 @@ JetFile: Annotations.kt
                     TYPE_REFERENCE
                       USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('bar')
+                          PsiElement(IDENTIFIER)('A')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_PROJECTION
                     TYPE_REFERENCE
                       USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('goo')
+                          PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
-              PsiElement(DOT)('.')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            VALUE_ARGUMENT
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
+                PsiElement(IDENTIFIER)('a')
+            PsiElement(COMMA)(',')
+            PsiWhiteSpace(' ')
+            VALUE_ARGUMENT
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('df')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    PsiElement(in)('in')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('sdfsdf')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    PsiElement(out)('out')
-  PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('ref')
-  PsiWhiteSpace('\n ')
-  CLASS
+                PsiElement(IDENTIFIER)('b')
+            PsiElement(RPAR)(')')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('ina')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  USER_TYPE
+                    USER_TYPE
+                      USER_TYPE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('foo')
+                        PsiElement(DOT)('.')
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('bar')
+                      PsiElement(DOT)('.')
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('goo')
+                    PsiElement(DOT)('.')
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('doo')
+                    TYPE_ARGUMENT_LIST
+                      PsiElement(LT)('<')
+                      TYPE_PROJECTION
+                        TYPE_REFERENCE
+                          USER_TYPE
+                            REFERENCE_EXPRESSION
+                              PsiElement(IDENTIFIER)('f')
+                      PsiElement(GT)('>')
+                  PsiElement(DOT)('.')
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('foo')
+                  TYPE_ARGUMENT_LIST
+                    PsiElement(LT)('<')
+                    TYPE_PROJECTION
+                      TYPE_REFERENCE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('bar')
+                    PsiElement(COMMA)(',')
+                    PsiWhiteSpace(' ')
+                    TYPE_PROJECTION
+                      TYPE_REFERENCE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('goo')
+                    PsiElement(GT)('>')
+                PsiElement(DOT)('.')
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('df')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      PsiElement(in)('in')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('sdfsdf')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      PsiElement(out)('out')
+    PsiWhiteSpace('\n ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Bar')
@@ -319,17 +316,10 @@ JetFile: Annotations.kt
           PsiWhiteSpace('\n')
           PsiElement(out)('out')
         PsiWhiteSpace('\n')
-        PsiElement(IDENTIFIER)('ref')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Missing '>'
         PsiElement(IDENTIFIER)('T')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
\ No newline at end of file
diff --git a/compiler/testData/psi/annotation/Annotations_ERR.kt b/compiler/testData/psi/annotation/Annotations_ERR.kt
index 3cd5c4bb069..0a44ec81950 100644
--- a/compiler/testData/psi/annotation/Annotations_ERR.kt
+++ b/compiler/testData/psi/annotation/Annotations_ERR.kt
@@ -19,7 +19,6 @@ in
 @[sdfsdf ]
 @[s fd d, ]
 out
-ref
  class Bar<abstract
 open
 enum
@@ -35,5 +34,5 @@ public
 internal
 in
 out
-ref T> {
+T> {
 }
diff --git a/compiler/testData/psi/annotation/Annotations_ERR.txt b/compiler/testData/psi/annotation/Annotations_ERR.txt
index f38e30a0d99..913a0b2566e 100644
--- a/compiler/testData/psi/annotation/Annotations_ERR.txt
+++ b/compiler/testData/psi/annotation/Annotations_ERR.txt
@@ -15,112 +15,46 @@ JetFile: Annotations_ERR.kt
   IMPORT_LIST
     <empty list>
   PsiWhiteSpace('\n\n')
-  MODIFIER_LIST
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(enum)('enum')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(annotation)('annotation')
-    PsiWhiteSpace('\n')
-    PsiElement(override)('override')
-    PsiWhiteSpace('\n')
-    PsiElement(open)('open')
-    PsiWhiteSpace('\n')
-    PsiElement(abstract)('abstract')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      PsiErrorElement:Expecting a list of annotations
-        <empty list>
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    PsiElement(private)('private')
-    PsiWhiteSpace('\n')
-    PsiElement(protected)('protected')
-    PsiWhiteSpace('\n')
-    PsiElement(public)('public')
-    PsiWhiteSpace('\n')
-    PsiElement(internal)('internal')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-              TYPE_ARGUMENT_LIST
-                PsiElement(LT)('<')
-                TYPE_PROJECTION
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('A')
-                PsiElement(COMMA)(',')
-                PsiWhiteSpace(' ')
-                TYPE_PROJECTION
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('B')
-                PsiElement(GT)('>')
-        VALUE_ARGUMENT_LIST
-          PsiElement(LPAR)('(')
-          VALUE_ARGUMENT
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('a')
-          PsiElement(COMMA)(',')
-          PsiWhiteSpace(' ')
-          VALUE_ARGUMENT
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('b')
-          PsiElement(RPAR)(')')
-      PsiErrorElement:No commas needed to separate annotations
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('ina')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
+  CLASS
+    MODIFIER_LIST
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(enum)('enum')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(annotation)('annotation')
+      PsiWhiteSpace('\n')
+      PsiElement(override)('override')
+      PsiWhiteSpace('\n')
+      PsiElement(open)('open')
+      PsiWhiteSpace('\n')
+      PsiElement(abstract)('abstract')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        PsiErrorElement:Expecting a list of annotations
+          <empty list>
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      PsiElement(private)('private')
+      PsiWhiteSpace('\n')
+      PsiElement(protected)('protected')
+      PsiWhiteSpace('\n')
+      PsiElement(public)('public')
+      PsiWhiteSpace('\n')
+      PsiElement(internal)('internal')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
               USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      USER_TYPE
-                        REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('foo')
-                      PsiElement(DOT)('.')
-                      REFERENCE_EXPRESSION
-                        PsiElement(IDENTIFIER)('bar')
-                    PsiElement(DOT)('.')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('goo')
-                  PsiElement(DOT)('.')
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('doo')
-                  TYPE_ARGUMENT_LIST
-                    PsiElement(LT)('<')
-                    TYPE_PROJECTION
-                      TYPE_REFERENCE
-                        USER_TYPE
-                          REFERENCE_EXPRESSION
-                            PsiElement(IDENTIFIER)('f')
-                    PsiElement(GT)('>')
-                PsiElement(DOT)('.')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
                 TYPE_ARGUMENT_LIST
@@ -129,79 +63,142 @@ JetFile: Annotations_ERR.kt
                     TYPE_REFERENCE
                       USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('bar')
+                          PsiElement(IDENTIFIER)('A')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_PROJECTION
                     TYPE_REFERENCE
                       USER_TYPE
                         REFERENCE_EXPRESSION
-                          PsiElement(IDENTIFIER)('goo')
+                          PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
-              PsiElement(DOT)('.')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            VALUE_ARGUMENT
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
+                PsiElement(IDENTIFIER)('a')
+            PsiElement(COMMA)(',')
+            PsiWhiteSpace(' ')
+            VALUE_ARGUMENT
               REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('df')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    PsiElement(in)('in')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('sdfsdf')
-      PsiWhiteSpace(' ')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    ANNOTATION
-      PsiElement(AT)('@')
-      PsiElement(LBRACKET)('[')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('s')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('fd')
-      PsiWhiteSpace(' ')
-      ANNOTATION_ENTRY
-        CONSTRUCTOR_CALLEE
-          TYPE_REFERENCE
-            USER_TYPE
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('d')
-      PsiErrorElement:No commas needed to separate annotations
-        PsiElement(COMMA)(',')
-      PsiWhiteSpace(' ')
-      PsiElement(RBRACKET)(']')
-    PsiWhiteSpace('\n')
-    PsiElement(out)('out')
-  PsiWhiteSpace('\n')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(IDENTIFIER)('ref')
-  PsiWhiteSpace('\n ')
-  CLASS
+                PsiElement(IDENTIFIER)('b')
+            PsiElement(RPAR)(')')
+        PsiErrorElement:No commas needed to separate annotations
+          PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('ina')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                USER_TYPE
+                  USER_TYPE
+                    USER_TYPE
+                      USER_TYPE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('foo')
+                        PsiElement(DOT)('.')
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('bar')
+                      PsiElement(DOT)('.')
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('goo')
+                    PsiElement(DOT)('.')
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('doo')
+                    TYPE_ARGUMENT_LIST
+                      PsiElement(LT)('<')
+                      TYPE_PROJECTION
+                        TYPE_REFERENCE
+                          USER_TYPE
+                            REFERENCE_EXPRESSION
+                              PsiElement(IDENTIFIER)('f')
+                      PsiElement(GT)('>')
+                  PsiElement(DOT)('.')
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('foo')
+                  TYPE_ARGUMENT_LIST
+                    PsiElement(LT)('<')
+                    TYPE_PROJECTION
+                      TYPE_REFERENCE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('bar')
+                    PsiElement(COMMA)(',')
+                    PsiWhiteSpace(' ')
+                    TYPE_PROJECTION
+                      TYPE_REFERENCE
+                        USER_TYPE
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('goo')
+                    PsiElement(GT)('>')
+                PsiElement(DOT)('.')
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('foo')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('df')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      PsiElement(in)('in')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('sdfsdf')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      ANNOTATION
+        PsiElement(AT)('@')
+        PsiElement(LBRACKET)('[')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('s')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('fd')
+        PsiWhiteSpace(' ')
+        ANNOTATION_ENTRY
+          CONSTRUCTOR_CALLEE
+            TYPE_REFERENCE
+              USER_TYPE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('d')
+        PsiErrorElement:No commas needed to separate annotations
+          PsiElement(COMMA)(',')
+        PsiWhiteSpace(' ')
+        PsiElement(RBRACKET)(']')
+      PsiWhiteSpace('\n')
+      PsiElement(out)('out')
+    PsiWhiteSpace('\n ')
     PsiElement(class)('class')
     PsiWhiteSpace(' ')
     PsiElement(IDENTIFIER)('Bar')
@@ -274,17 +271,10 @@ JetFile: Annotations_ERR.kt
           PsiWhiteSpace('\n')
           PsiElement(out)('out')
         PsiWhiteSpace('\n')
-        PsiElement(IDENTIFIER)('ref')
-      PsiWhiteSpace(' ')
-      PsiErrorElement:Missing '>'
         PsiElement(IDENTIFIER)('T')
-  PsiErrorElement:Expecting a top level declaration
-    PsiElement(GT)('>')
-  PsiWhiteSpace(' ')
-  FUN
-    PsiErrorElement:Expecting a top level declaration
-      <empty list>
-    BLOCK
+      PsiElement(GT)('>')
+    PsiWhiteSpace(' ')
+    CLASS_BODY
       PsiElement(LBRACE)('{')
       PsiWhiteSpace('\n')
       PsiElement(RBRACE)('}')
\ No newline at end of file