diff --git a/.idea/modules.xml b/.idea/modules.xml
index a7eb64f9ca7..c9d9f6c088f 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -6,6 +6,7 @@
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend/frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
       <module fileurl="file://$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" filepath="$PROJECT_DIR$/../Kotlin/jet/compiler/frontend.java/frontend.java.iml" />
+      <module fileurl="file://$PROJECT_DIR$/examples/jetTests.iml" filepath="$PROJECT_DIR$/examples/jetTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/js/js.iml" filepath="$PROJECT_DIR$/js/js.iml" />
       <module fileurl="file://$PROJECT_DIR$/translator/translator.iml" filepath="$PROJECT_DIR$/translator/translator.iml" />
     </modules>
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 071fe3c2f83..7234e15e999 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,11 +7,58 @@
     <bookmark url="file://$PROJECT_DIR$/translator/testFiles/propertyAccess/cases/safeCallReturnsNullIfFails.kt" line="3" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="Supported single file without namespace.">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/kotlinLib/cases/array.js" />
+    <list default="true" id="f02ef53d-47a4-4f5e-a1aa-3df68aae9b20" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/lib/asm-util-3.3.1.jar" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jetTests.iml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/test/ExampleTestSuite.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/jetTests/test/ExampleTestSuite.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameter.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/diamondInheritance.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/enclosingLocalVariable.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/funDelegation.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/rightHandOverride.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/failed/simpleBox.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/obscure/inheritedMethod.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/basicproperty.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObject.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObjectInterface.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/classObjectMethod.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/enclosed.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/extensionClosure.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/inheritance.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/traitproperty.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/basicmethod.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/innerClass.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" afterPath="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" afterPath="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ConditionalTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ConditionalTest.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" afterPath="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/translator/translator.iml" afterPath="$PROJECT_DIR$/translator/translator.iml" />
     </list>
     <ignored path="k2js.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -42,6 +89,60 @@
     <disable_hints />
   </component>
   <component name="DebuggerManager">
+    <line_breakpoints>
+      <breakpoint url="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java" line="50" class="org.jetbrains.jet.JetTestCaseBuilder" package="org.jetbrains.jet">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="41" class="JetTestCaseBuilder" package="">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" line="61" class="JetTestCaseBuilder" package="">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+      <breakpoint url="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" line="35" class="org.jetbrains.k2js.translate.reference.ReferenceTranslator" package="org.jetbrains.k2js.translate.reference">
+        <option name="ENABLED" value="true" />
+        <option name="LOG_ENABLED" value="false" />
+        <option name="LOG_EXPRESSION_ENABLED" value="false" />
+        <option name="SUSPEND_POLICY" value="SuspendAll" />
+        <option name="COUNT_FILTER_ENABLED" value="false" />
+        <option name="COUNT_FILTER" value="0" />
+        <option name="CONDITION_ENABLED" value="false" />
+        <option name="CLASS_FILTERS_ENABLED" value="false" />
+        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+        <option name="CONDITION" value="" />
+        <option name="LOG_MESSAGE" value="" />
+      </breakpoint>
+    </line_breakpoints>
     <breakpoint_any>
       <breakpoint>
         <option name="NOTIFY_CAUGHT" value="true" />
@@ -81,96 +182,94 @@
     <favorites_list name="k2js" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5494186">
+    <splitter split-orientation="horizontal" split-proportion="0.3720087">
       <split-first>
         <leaf>
-          <file leaf-file-name="NamespaceTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java">
+          <file leaf-file-name="propertyDelegation.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="40" column="0" selection-start="1462" selection-end="1462" vertical-scroll-proportion="0.0">
+                <state line="16" column="18" selection-start="301" selection-end="301" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ClassDeclarationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java">
+          <file leaf-file-name="initializerBlock.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="91" column="0" selection-start="3568" selection-end="3568" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ReferenceTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
+          <file leaf-file-name="closureWithParameterAndBoxing.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="61" column="0" selection-start="2457" selection-end="2457" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="PatternMatchingTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
+          <file leaf-file-name="newInstanceDefaultConstructor.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="52" column="16" selection-start="1137" selection-end="1137" vertical-scroll-proportion="0.0">
+                <state line="9" column="15" selection-start="149" selection-end="149" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="kotlin_lib.js" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.js">
+          <file leaf-file-name="newInstanceDefaultConstructor.js" pinned="false" current="true" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/out/newInstanceDefaultConstructor.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="431" column="10" selection-start="10544" selection-end="10544" vertical-scroll-proportion="0.0">
+                <state line="16" column="36" selection-start="356" selection-end="356" vertical-scroll-proportion="0.40902257">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="array.js" pinned="false" current="true" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/testFiles/kotlinLib/cases/array.js">
+          <file leaf-file-name="kt242.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/kt242.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="1" column="23" selection-start="41" selection-end="41" vertical-scroll-proportion="0.02467344">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ExtractionVisitor.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/ExtractionVisitor.java">
+          <file leaf-file-name="basicmethod.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/basicmethod.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="106" column="38" selection-start="4951" selection-end="4951" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java">
+          <file leaf-file-name="basicproperty.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/basicproperty.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="117" column="103" selection-start="4790" selection-end="4790" vertical-scroll-proportion="19.88">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="BasicClassTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/BasicClassTest.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="63" column="16" selection-start="1653" selection-end="1653" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="KotlinLibTest.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java">
+          <file leaf-file-name="enclosed.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/enclosed.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="86" column="16" selection-start="3059" selection-end="3059" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="traitproperty.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/traitproperty.jet">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
@@ -180,101 +279,94 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="TranslationUtils.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/TranslationUtils.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="131" column="5" selection-start="6059" selection-end="6059" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="ClassSorter.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/ClassSorter.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="14" column="19" selection-start="395" selection-end="395" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="DiGraphNode.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/DiGraphNode.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="41" column="6" selection-start="1778" selection-end="1778" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                  </folding>
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="PartiallyOrderedSet.java" pinned="false" current="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/PartiallyOrderedSet.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="2" column="48" selection-start="83" selection-end="83" vertical-scroll-proportion="-1.8564743">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
-          <file leaf-file-name="Namer.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/Namer.java">
-              <provider selected="true" editor-type-id="text-editor">
-                <state line="12" column="19" selection-start="287" selection-end="287" vertical-scroll-proportion="0.0">
-                  <folding />
-                </state>
-              </provider>
-            </entry>
-          </file>
           <file leaf-file-name="PropertyTranslator.java" pinned="false" current="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="128" column="65" selection-start="5196" selection-end="5196" vertical-scroll-proportion="0.0">
+                <state line="142" column="5" selection-start="5809" selection-end="5809" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="JetTestCaseBuilder.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="41" column="0" selection-start="1564" selection-end="1564" vertical-scroll-proportion="0.0">
                   <folding>
                     <element signature="imports" expanded="true" />
-                    <element signature="e#1340#1363#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="NamespaceInitializerTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/NamespaceInitializerTranslator.java">
+          <file leaf-file-name="inheritedMethod.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/obscure/inheritedMethod.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="12" column="19" selection-start="419" selection-end="419" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="BinaryOperationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/BinaryOperationTranslator.java">
+          <file leaf-file-name="exceptionConstructor.jet" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="17" column="19" selection-start="690" selection-end="690" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="OperationTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/operation/OperationTranslator.java">
+          <file leaf-file-name="enclosingThis.jet" pinned="false" current="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.jet">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="19" column="13" selection-start="815" selection-end="815" vertical-scroll-proportion="0.0">
+                <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="ClassInitializerTranslator.java" pinned="false" current="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/initializer/ClassInitializerTranslator.java">
+          <file leaf-file-name="FunctionTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state line="90" column="61" selection-start="3770" selection-end="3770" vertical-scroll-proportion="0.0">
-                  <folding>
-                    <element signature="imports" expanded="true" />
-                    <element signature="e#1006#1019#0" expanded="true" />
-                    <element signature="e#3405#3418#0" expanded="true" />
-                  </folding>
+                <state line="25" column="49" selection-start="851" selection-end="851" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="PropertyAccessTranslator.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/PropertyAccessTranslator.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="27" column="19" selection-start="1307" selection-end="1307" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="Translation.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="30" column="35" selection-start="1506" selection-end="1506" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="TranslationContext.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="194" column="18" selection-start="7031" selection-end="7031" vertical-scroll-proportion="0.0">
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="JetDeclarationWithBody.java" pinned="false" current="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetDeclarationWithBody.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state line="11" column="17" selection-start="228" selection-end="228" vertical-scroll-proportion="0.0">
+                  <folding />
                 </state>
               </provider>
             </entry>
@@ -300,22 +392,22 @@
   <component name="IdeDocumentHistory">
     <option name="changedFiles">
       <list>
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/utils/PartiallyOrderedSet.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceProvider.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/class/cases/classWithoutNamespace.kt" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/ExtractionVisitor.java" />
-        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/BasicClassTest.java" />
-        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ConditionalTest.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTestSuite.java" />
+        <option value="$PROJECT_DIR$/../../Kotlin/jet/compiler/tests/org/jetbrains/jet/JetLiteFixture.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/examples/ExampleTestSuite.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/jetTests/JetTestCaseBuilder.java" />
+        <option value="$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/TranslationTest.java" />
+        <option value="$PROJECT_DIR$/examples/test/ExampleTestSuite.java" />
         <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java" />
-        <option value="$PROJECT_DIR$/translator/testFiles/kotlin_lib.js" />
-        <option value="$PROJECT_DIR$/translator/testFiles/kotlinLib/cases/array.js" />
+        <option value="$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/ExampleTest.java" />
+        <option value="$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/examples/cases/simpleClass.jet" />
+        <option value="$PROJECT_DIR$/translator/testFiles/examples/cases/kt245.jet" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java" />
+        <option value="$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java" />
       </list>
     </option>
   </component>
@@ -405,20 +497,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="PackagesPane">
-        <subPane>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-        </subPane>
-      </pane>
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -465,7 +543,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="kotlinLib" />
+              <option name="myItemId" value="sortedTests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="usesJava" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -479,7 +561,139 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sortedTests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sortedTests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="unexpectedError" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sortedTests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="obscure" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="sortedTests" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="failed" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="examples" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="out" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="testFiles" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="examples" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="cases" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="translator" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="test" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -517,7 +731,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
+              <option name="myItemId" value="examples" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -527,30 +741,26 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
+              <option name="myItemId" value="examples" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
+              <option name="myItemId" value="test" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+        </subPane>
+      </pane>
+      <pane id="PackagesPane">
+        <subPane>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="k2js" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="frontend" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="jet" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+              <option name="myItemId" value="k2js" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
@@ -562,6 +772,7 @@
   <component name="PropertiesComponent">
     <property name="GoToFile.includeJavaFiles" value="false" />
     <property name="project.structure.last.edited" value="Modules" />
+    <property name="OverrideImplement.combined" value="true" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="options.splitter.main.proportions" value="0.3" />
     <property name="recentsLimit" value="5" />
@@ -573,118 +784,27 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="MemberChooser.showClasses" value="true" />
     <property name="GoToClass.includeLibraries" value="false" />
-    <property name="options.searchVisible" value="true" />
-    <property name="options.splitter.details.proportions" value="0.2" />
     <property name="dynamic.classpath" value="false" />
+    <property name="options.splitter.details.proportions" value="0.2" />
+    <property name="options.searchVisible" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="org.jetbrains.k2js.jetTests" />
       <recent name="org.jetbrains.k2js.backend" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\examples\cases" />
+      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\examples" />
+      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\lib" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles" />
       <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\trait\cases" />
-      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\expression\function\cases" />
-      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\class\cases" />
-      <recent name="C:\Dev\Projects\jet-contrib\k2js\translator\testFiles\inheritance" />
+    </key>
+    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name="org.jetbrains.k2js.test.examples" />
     </key>
   </component>
-  <component name="RunManager" selected="JUnit.All in translator">
-    <configuration default="false" name="ClassInheritanceTest.valuePassedToAncestorConstructor" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.ClassInheritanceTest" />
-      <option name="METHOD_NAME" value="valuePassedToAncestorConstructor" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/translator" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <ConfigurationWrapper RunnerId="Debug" />
-      <method />
-    </configuration>
-    <configuration default="false" name="PropertyAccessTest.classUsesNamespaceProperties" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="org.jetbrains.k2js.test.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="org.jetbrains.k2js.test" />
-      <option name="MAIN_CLASS_NAME" value="org.jetbrains.k2js.test.PropertyAccessTest" />
-      <option name="METHOD_NAME" value="classUsesNamespaceProperties" />
-      <option name="TEST_OBJECT" value="method" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/translator" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="All in translator" type="JUnit" factoryName="JUnit" temporary="true">
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <module name="translator" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" value="" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="" />
-      <option name="METHOD_NAME" value="" />
-      <option name="TEST_OBJECT" value="package" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/translator" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Debug">
-        <option name="DEBUG_PORT" value="" />
-        <option name="TRANSPORT" value="0" />
-        <option name="LOCAL" value="true" />
-      </RunnerSettings>
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Debug" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
+  <component name="RunManager" selected="JUnit.ExampleTestSuite">
     <configuration default="false" name="ClassInheritanceTest.initializersOfBasicClassExecute" type="JUnit" factoryName="JUnit" temporary="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
         <pattern>
@@ -751,6 +871,92 @@
       <ConfigurationWrapper RunnerId="Run" />
       <method />
     </configuration>
+    <configuration default="false" name="ExampleTestSuite" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="jetTests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" value="" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="ExampleTestSuite" />
+      <option name="METHOD_NAME" value="" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="QuickJetPsiCheckerTest" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true">
+        <pattern>
+          <option name="PATTERN" value="org.jetbrains.jet.checkers.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="compiler-tests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="org.jetbrains.jet.checkers" />
+      <option name="MAIN_CLASS_NAME" value="org.jetbrains.jet.checkers.QuickJetPsiCheckerTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Debug">
+        <option name="DEBUG_PORT" value="" />
+        <option name="TRANSPORT" value="0" />
+        <option name="LOCAL" value="true" />
+      </RunnerSettings>
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Debug" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="All in jetTests" type="JUnit" factoryName="JUnit" temporary="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" />
+      <module name="jetTests" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="package" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="moduleWithDependencies" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -809,6 +1015,17 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
+    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
+      <JSDebuggerConfigurationSettings>
+        <option name="engineId" value="embedded" />
+        <option name="fileUrl" />
+      </JSDebuggerConfigurationSettings>
+      <method>
+        <option name="AntTarget" enabled="false" />
+        <option name="BuildArtifacts" enabled="false" />
+        <option name="Maven.BeforeRunTask" enabled="false" />
+      </method>
+    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" />
       <module name="" />
@@ -835,23 +1052,12 @@
         <option name="Maven.BeforeRunTask" enabled="false" />
       </method>
     </configuration>
-    <configuration default="true" type="JavascriptDebugSession" factoryName="Local">
-      <JSDebuggerConfigurationSettings>
-        <option name="engineId" value="embedded" />
-        <option name="fileUrl" />
-      </JSDebuggerConfigurationSettings>
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.valuePassedToAncestorConstructor" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.PropertyAccessTest.classUsesNamespaceProperties" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.All in translator" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.initializersOfBasicClassExecute" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.BasicClassTest.classWithoutNamespace" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.ClassInheritanceTest.initializersOfBasicClassExecute" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.BasicClassTest.classWithoutNamespace" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.ExampleTestSuite" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.QuickJetPsiCheckerTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.All in jetTests" />
     </list>
     <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
       <Host>localhost</Host>
@@ -907,7 +1113,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32853025" sideWeight="0.49812934" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -924,13 +1130,13 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977018" sideWeight="0.728146" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3997862" sideWeight="0.6705998" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2645644" sideWeight="0.7319885" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26801154" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26296097" sideWeight="0.7319885" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26801154" sideWeight="0.64190274" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Metrics" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3275862" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.0908605" sideWeight="0.7146974" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3994253" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="JsTestDriver Server" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32907662" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
     </layout>
@@ -969,7 +1175,7 @@
     <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
     <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="Supported single file without namespace." />
+    <option name="LAST_COMMIT_MESSAGE" value="Added array basic class." />
     <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -982,7 +1188,6 @@
     <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <MESSAGE value="Work on namespaces in progress." />
     <MESSAGE value="Finished work on namespaces." />
     <MESSAGE value="Fixed design flaw which prevented base class from being inherited if it was defined after the derived class." />
     <MESSAGE value="Added test. Refactored test code: got rid of obsolete IncludeLibraryTest class." />
@@ -1007,6 +1212,7 @@
     <MESSAGE value="Fixed a bug where class could not access namespace properties." />
     <MESSAGE value="Corrected class declaration logic." />
     <MESSAGE value="Supported single file without namespace." />
+    <MESSAGE value="Added array basic class." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager />
@@ -1016,119 +1222,116 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassTranslator.java">
+    <entry file="file://$PROJECT_DIR$/examples/test/JetTestCaseBuilder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="103" column="36" selection-start="4426" selection-end="4426" vertical-scroll-proportion="0.0">
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#5602#5625#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/utils/BindingUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="91" column="53" selection-start="4181" selection-end="4181" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/Declarations.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="19" selection-start="362" selection-end="362" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/class/cases/classWithoutNamespace.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="6" column="16" selection-start="67" selection-end="67" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/Translation.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="95" column="0" selection-start="4447" selection-end="4447" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/class/out/classWithoutNamespace.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/declarations/ExtractionVisitor.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="106" column="38" selection-start="4951" selection-end="4951" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/general/TranslationContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="103" selection-start="4790" selection-end="4790" vertical-scroll-proportion="19.88">
+        <state line="41" column="0" selection-start="1564" selection-end="1564" vertical-scroll-proportion="0.0">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/BasicClassTest.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="63" column="16" selection-start="1653" selection-end="1653" vertical-scroll-proportion="0.0">
+        <state line="15" column="105" selection-start="540" selection-end="540" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/NamespaceTranslator.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/obscure/inheritedMethod.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="0" selection-start="1462" selection-end="1462" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/declaration/ClassDeclarationTranslator.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPropertyAccessor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="91" column="0" selection-start="3568" selection-end="3568" vertical-scroll-proportion="0.0">
+        <state line="15" column="70" selection-start="421" selection-end="421" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/src/org/jetbrains/k2js/translate/reference/ReferenceTranslator.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="61" column="0" selection-start="2457" selection-end="2457" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/PatternMatchingTest.java">
+    <entry file="file://$PROJECT_DIR$/../../Kotlin/jet/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="16" selection-start="1137" selection-end="1137" vertical-scroll-proportion="0.0">
+        <state line="10" column="17" selection-start="209" selection-end="209" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/failed/enclosingThis.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="86" column="16" selection-start="3059" selection-end="3059" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/kotlin_lib.js">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/traitproperty.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="431" column="10" selection-start="10544" selection-end="10544" vertical-scroll-proportion="0.0">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/translator/testFiles/kotlinLib/cases/array.js">
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/propertyDelegation.jet">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="1" column="23" selection-start="41" selection-end="41" vertical-scroll-proportion="0.02467344">
+        <state line="16" column="18" selection-start="301" selection-end="301" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/initializerBlock.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="9" column="15" selection-start="149" selection-end="149" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/cases/simplestClosure.jet">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/translator/testFiles/examples/out/newInstanceDefaultConstructor.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="16" column="36" selection-start="356" selection-end="356" vertical-scroll-proportion="0.40902257">
           <folding />
         </state>
       </provider>
@@ -1150,7 +1353,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Android</last-edited>
+          <last-edited>No facets are configured</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1162,7 +1365,7 @@
       </state>
       <state key="GlobalLibrariesConfigurable.UI">
         <settings>
-          <last-edited>guava-10.0.1</last-edited>
+          <last-edited>asm-util-3.3.1</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1174,7 +1377,7 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
-          <last-edited>1.6</last-edited>
+          <last-edited>IDEA IC-110.408</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1186,7 +1389,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>js</last-edited>
+          <last-edited>frontend.java</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/examples/jetTests.iml b/examples/jetTests.iml
new file mode 100644
index 00000000000..be9f52c5cfd
--- /dev/null
+++ b/examples/jetTests.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA IC-110.408" jdkType="IDEA JDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="translator" />
+  </component>
+</module>
+
diff --git a/examples/test/ExampleTestSuite.java b/examples/test/ExampleTestSuite.java
new file mode 100644
index 00000000000..9274155c810
--- /dev/null
+++ b/examples/test/ExampleTestSuite.java
@@ -0,0 +1,34 @@
+import com.intellij.testFramework.UsefulTestCase;
+import junit.framework.Test;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.k2js.test.ExampleTest;
+
+public final class ExampleTestSuite extends UsefulTestCase {
+
+    private String name;
+    private ExampleTest tester = new ExampleTest();
+
+    public ExampleTestSuite(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    public void runTest() throws Exception {
+        tester.runBoxTest(getName());
+    }
+
+    public static Test suite() {
+        return JetTestCaseBuilder.suiteForDirectory("translator",
+                "/testFiles/examples/cases/", true, new JetTestCaseBuilder.NamedTestFactory() {
+            @NotNull
+            @Override
+            public Test createTest(@NotNull String dataPath, @NotNull String name) {
+                return (new ExampleTestSuite(name));
+            }
+        });
+    }
+}
diff --git a/examples/test/JetTestCaseBuilder.java b/examples/test/JetTestCaseBuilder.java
new file mode 100644
index 00000000000..eb8b79857af
--- /dev/null
+++ b/examples/test/JetTestCaseBuilder.java
@@ -0,0 +1,86 @@
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FilenameFilter;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author abreslav
+ */
+public abstract class JetTestCaseBuilder {
+    public static FilenameFilter emptyFilter = new FilenameFilter() {
+        @Override
+        public boolean accept(File file, String name) {
+            return true;
+        }
+    };
+
+    public interface NamedTestFactory {
+        @NotNull
+        Test createTest(@NotNull String dataPath, @NotNull String name);
+    }
+
+    @NotNull
+    public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, @NotNull NamedTestFactory factory) {
+        return suiteForDirectory(baseDataDir, dataPath, recursive, emptyFilter, factory);
+    }
+
+    @NotNull
+    public static TestSuite suiteForDirectory(String baseDataDir, @NotNull final String dataPath, boolean recursive, final FilenameFilter filter, @NotNull NamedTestFactory factory) {
+        TestSuite suite = new TestSuite(dataPath);
+        appendTestsInDirectory(baseDataDir, dataPath, recursive, filter, factory, suite);
+        return suite;
+    }
+
+    public static void appendTestsInDirectory(String baseDataDir, String dataPath, boolean recursive,
+                                              final FilenameFilter filter, NamedTestFactory factory, TestSuite suite) {
+        final String extensionJet = ".jet";
+        final String extensionKt = ".kt";
+        final FilenameFilter extensionFilter = new FilenameFilter() {
+            @Override
+            public boolean accept(File dir, String name) {
+                return name.endsWith(extensionJet) || name.endsWith(extensionKt);
+            }
+        };
+        FilenameFilter resultFilter;
+        if (filter != emptyFilter) {
+            resultFilter = new FilenameFilter() {
+                @Override
+                public boolean accept(File file, String s) {
+                    return extensionFilter.accept(file, s) && filter.accept(file, s);
+                }
+            };
+        } else {
+            resultFilter = extensionFilter;
+        }
+        File dir = new File(baseDataDir + dataPath);
+        FileFilter dirFilter = new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.isDirectory();
+            }
+        };
+        if (recursive) {
+            File[] files = dir.listFiles(dirFilter);
+            assert files != null : dir;
+            List<File> subdirs = Arrays.asList(files);
+            Collections.sort(subdirs);
+            for (File subdir : subdirs) {
+                suite.addTest(suiteForDirectory(baseDataDir, dataPath + "/" + subdir.getName(), recursive, filter, factory));
+            }
+        }
+        List<File> files = Arrays.asList(dir.listFiles(resultFilter));
+        Collections.sort(files);
+        for (File file : files) {
+            String fileName = file.getName();
+            assert fileName != null;
+            String extension = fileName.endsWith(extensionJet) ? extensionJet : extensionKt;
+            suite.addTest(factory.createTest(dataPath, fileName));
+        }
+    }
+}
diff --git a/jetTests/test/ExampleTestSuite.java b/jetTests/test/ExampleTestSuite.java
new file mode 100644
index 00000000000..288d42b3743
--- /dev/null
+++ b/jetTests/test/ExampleTestSuite.java
@@ -0,0 +1,33 @@
+import junit.framework.Test;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetLiteFixture;
+
+
+public final class ExampleTestSuite extends JetLiteFixture {
+    private String name;
+
+    public ExampleTestSuite(@NonNls String dataPath, String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return "test" + name;
+    }
+
+    public void runTest() throws Exception {
+
+    }
+
+
+    public static Test suite() {
+        return JetTestCaseBuilder.suiteForDirectory(JetTestCaseBuilder.getTestDataPathBase(),
+                "/checkerWithErrorTypes/quick", true, new JetTestCaseBuilder.NamedTestFactory() {
+            @NotNull
+            @Override
+            public Test createTest(@NotNull String dataPath, @NotNull String name) {
+                return (new ExampleTestSuite(dataPath, name));
+            }
+        });
+    }
+}
diff --git a/translator/lib/asm-util-3.3.1.jar b/translator/lib/asm-util-3.3.1.jar
new file mode 100644
index 00000000000..0230bbcfb71
Binary files /dev/null and b/translator/lib/asm-util-3.3.1.jar differ
diff --git a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
index fb4f5d50dc5..8abe4a6126d 100644
--- a/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/declaration/PropertyTranslator.java
@@ -7,7 +7,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.PropertyDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertyGetterDescriptor;
 import org.jetbrains.jet.lang.descriptors.PropertySetterDescriptor;
-import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.jet.lang.psi.JetPropertyAccessor;
 import org.jetbrains.k2js.translate.general.AbstractTranslator;
@@ -139,20 +138,6 @@ public final class PropertyTranslator extends AbstractTranslator {
 
     @NotNull
     private JsPropertyInitializer translateCustomAccessor(@NotNull JetPropertyAccessor expression) {
-        JsFunction methodBody = translateCustomAccessorBody(expression);
-        // we know that custom getters and setters always have their descriptors
-        return AstUtil.newNamedMethod(context().getNameForElement(expression), methodBody);
+        return Translation.functionTranslator(expression, context()).translateAsMethod();
     }
-
-    @NotNull
-    private JsFunction translateCustomAccessorBody(@NotNull JetPropertyAccessor expression) {
-        JsFunction methodBody = JsFunction.getAnonymousFunctionWithScope(context().getScopeForElement(expression));
-        JetExpression bodyExpression = expression.getBodyExpression();
-        assert bodyExpression != null : "Custom accessor should have a body.";
-        JsBlock methodBodyBlock = AstUtil.convertToBlock(
-                Translation.translateExpression(bodyExpression, context().newPropertyAccess(expression)));
-        methodBody.setBody(methodBodyBlock);
-        return methodBody;
-    }
-
 }
diff --git a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
index 79a17e4bd2c..c83b04f6fd3 100644
--- a/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
+++ b/translator/src/org/jetbrains/k2js/translate/expression/FunctionTranslator.java
@@ -17,16 +17,18 @@ import java.util.List;
 public final class FunctionTranslator extends AbstractTranslator {
 
     @NotNull
-    private final JetFunction functionDeclaration;
+    private final JetDeclarationWithBody functionDeclaration;
     @NotNull
     private final JsFunction functionObject;
 
     @NotNull
-    public static FunctionTranslator newInstance(@NotNull JetFunction function, @NotNull TranslationContext context) {
+    public static FunctionTranslator newInstance(@NotNull JetDeclarationWithBody function,
+                                                 @NotNull TranslationContext context) {
         return new FunctionTranslator(function, context);
     }
 
-    private FunctionTranslator(@NotNull JetFunction functionDeclaration, @NotNull TranslationContext context) {
+    private FunctionTranslator(@NotNull JetDeclarationWithBody functionDeclaration,
+                               @NotNull TranslationContext context) {
         super(context);
         this.functionDeclaration = functionDeclaration;
         this.functionObject = createFunctionObject();
@@ -34,7 +36,8 @@ public final class FunctionTranslator extends AbstractTranslator {
 
     @NotNull
     public JsPropertyInitializer translateAsMethod() {
-        JsName functionName = context().getNameForElement(functionDeclaration);
+        assert functionDeclaration instanceof JetElement;
+        JsName functionName = context().getNameForElement((JetElement) functionDeclaration);
         JsFunction function = generateFunctionObject();
         return new JsPropertyInitializer(functionName.makeRef(), function);
     }
@@ -53,16 +56,25 @@ public final class FunctionTranslator extends AbstractTranslator {
     }
 
     private JsFunction createFunctionObject() {
-        if (functionDeclaration instanceof JetNamedFunction) {
+        if (isDeclaration()) {
             return JsFunction.getAnonymousFunctionWithScope
-                    (context().getScopeForElement(functionDeclaration));
+                    (context().getScopeForElement((JetDeclaration) functionDeclaration));
         }
-        if (functionDeclaration instanceof JetFunctionLiteral) {
+        if (isLiteral()) {
             return new JsFunction(context().enclosingScope());
         }
         throw new AssertionError("Unsupported type of functionDeclaration.");
     }
 
+    private boolean isLiteral() {
+        return functionDeclaration instanceof JetFunctionLiteral;
+    }
+
+    private boolean isDeclaration() {
+        return (functionDeclaration instanceof JetNamedFunction) ||
+                (functionDeclaration instanceof JetPropertyAccessor);
+    }
+
     @NotNull
     private JsBlock translateBody() {
         JetExpression jetBodyExpression = functionDeclaration.getBodyExpression();
@@ -101,7 +113,10 @@ public final class FunctionTranslator extends AbstractTranslator {
         if (functionDeclaration instanceof JetNamedFunction) {
             return context().newFunctionDeclaration((JetNamedFunction) functionDeclaration);
         }
-        if (functionDeclaration instanceof JetFunctionLiteral) {
+        if (functionDeclaration instanceof JetPropertyAccessor) {
+            return context().newPropertyAccess((JetPropertyAccessor) functionDeclaration);
+        }
+        if (isLiteral()) {
             return context().newEnclosingScope(functionObject.getScope());
         }
         throw new AssertionError("Unsupported type of functionDeclaration.");
diff --git a/translator/src/org/jetbrains/k2js/translate/general/Translation.java b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
index 2b5459b8930..71215e2aec8 100644
--- a/translator/src/org/jetbrains/k2js/translate/general/Translation.java
+++ b/translator/src/org/jetbrains/k2js/translate/general/Translation.java
@@ -26,7 +26,7 @@ import org.jetbrains.k2js.translate.reference.ReferenceTranslator;
 public final class Translation {
 
     @NotNull
-    static public FunctionTranslator functionTranslator(@NotNull JetFunction function,
+    static public FunctionTranslator functionTranslator(@NotNull JetDeclarationWithBody function,
                                                         @NotNull TranslationContext context) {
         return FunctionTranslator.newInstance(function, context);
     }
diff --git a/translator/test/org/jetbrains/k2js/test/ConditionalTest.java b/translator/test/org/jetbrains/k2js/test/ConditionalTest.java
index a7124ad6923..449d869a16e 100644
--- a/translator/test/org/jetbrains/k2js/test/ConditionalTest.java
+++ b/translator/test/org/jetbrains/k2js/test/ConditionalTest.java
@@ -6,6 +6,7 @@ import org.junit.Test;
  * @author Talanov Pavel
  */
 public class ConditionalTest extends AbstractExpressionTest {
+
     final private static String MAIN = "conditional/";
 
     @Override
diff --git a/translator/test/org/jetbrains/k2js/test/ExampleTest.java b/translator/test/org/jetbrains/k2js/test/ExampleTest.java
new file mode 100644
index 00000000000..fc974b05737
--- /dev/null
+++ b/translator/test/org/jetbrains/k2js/test/ExampleTest.java
@@ -0,0 +1,18 @@
+package org.jetbrains.k2js.test;
+
+/**
+ * @author Talanov Pavel
+ */
+public final class ExampleTest extends TranslationTest {
+
+    final private static String MAIN = "examples/";
+
+    @Override
+    protected String mainDirectory() {
+        return MAIN;
+    }
+
+    public void runBoxTest(String filename) throws Exception {
+        testFunctionOutput(filename, "Anonymous", "box", "OK");
+    }
+}
diff --git a/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java b/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java
index c9805a8358f..f2bfc45db9d 100644
--- a/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java
+++ b/translator/test/org/jetbrains/k2js/test/KotlinLibTest.java
@@ -76,6 +76,8 @@ public class KotlinLibTest extends TranslationTest {
                 new RhinoPropertyTypesChecker("foo", propertyToType));
     }
 
+    //
+    // TODO:Refactor calls to function result checker with test
     @Test
     public void namespaceHasDeclaredFunction() throws Exception {
         runRhinoTest(Arrays.asList(kotlinLibraryPath(), cases("namespace.js")),
diff --git a/translator/test/org/jetbrains/k2js/test/TranslationTest.java b/translator/test/org/jetbrains/k2js/test/TranslationTest.java
index 7cbad97c0aa..f17ac30dc28 100644
--- a/translator/test/org/jetbrains/k2js/test/TranslationTest.java
+++ b/translator/test/org/jetbrains/k2js/test/TranslationTest.java
@@ -14,7 +14,7 @@ import java.util.List;
  */
 public abstract class TranslationTest {
 
-    final protected static String TEST_FILES = "testFiles/";
+    final protected static String TEST_FILES = "translator/testFiles/";
     final private static String CASES = "cases/";
     final private static String OUT = "out/";
     final private static String KOTLIN_JS_LIB = TEST_FILES + "kotlin_lib.js";
diff --git a/translator/testFiles/examples/cases/closureWithParameter.jet b/translator/testFiles/examples/cases/closureWithParameter.jet
new file mode 100644
index 00000000000..0c556d628c1
--- /dev/null
+++ b/translator/testFiles/examples/cases/closureWithParameter.jet
@@ -0,0 +1,7 @@
+fun box() : String {
+    return apply( "OK", {(arg: String) => arg } )
+}
+
+fun apply(arg : String, f : fun (p:String) : String) : String {
+    return f(arg)
+}
diff --git a/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet b/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet
new file mode 100644
index 00000000000..6d0a4ffa658
--- /dev/null
+++ b/translator/testFiles/examples/cases/closureWithParameterAndBoxing.jet
@@ -0,0 +1,7 @@
+fun box() : String {
+    return if (apply( 5, {(arg: Int) => arg + 13 } ) == 18) "OK" else "fail"
+}
+
+fun apply(arg : Int, f : fun (p:Int) : Int) : Int {
+    return f(arg)
+}
diff --git a/translator/testFiles/examples/cases/diamondInheritance.jet b/translator/testFiles/examples/cases/diamondInheritance.jet
new file mode 100644
index 00000000000..210aecafedc
--- /dev/null
+++ b/translator/testFiles/examples/cases/diamondInheritance.jet
@@ -0,0 +1,24 @@
+// Changed when traits were introduced. May not make sense any more
+
+open class Base() {
+    public var v : Int = 0
+}
+
+open class Left() : Base() {}
+trait Right : Base {}
+
+class D() : Left(), Right
+
+fun vl(l : Left) : Int = l.v
+fun vr(r : Right) : Int = r.v
+
+fun box() : String {
+    val d = D()
+    d.v = 42
+
+    if (d.v != 42) return "Fail #1"
+    if (vl(d) != 42) return "Fail #2"
+    if (vr(d) != 42) return "Fail #3"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet b/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet
new file mode 100644
index 00000000000..d8e5ea789f2
--- /dev/null
+++ b/translator/testFiles/examples/cases/doubleEnclosedLocalVariable.jet
@@ -0,0 +1,8 @@
+fun box() : String {
+    val cl = 39
+    return if (sum(200, { val ff = {cl}; ff() }) == 239) "OK" else "FAIL"
+}
+
+fun sum(arg:Int, f : fun () : Int) : Int {
+    return arg + f()
+}
diff --git a/translator/testFiles/examples/cases/enclosingLocalVariable.jet b/translator/testFiles/examples/cases/enclosingLocalVariable.jet
new file mode 100644
index 00000000000..d2dbe243469
--- /dev/null
+++ b/translator/testFiles/examples/cases/enclosingLocalVariable.jet
@@ -0,0 +1,8 @@
+fun box() : String {
+    val cl = 39
+    return if (sum(200, { val m = { val r = { cl };  r() }; m() }) == 239) "OK" else "FAIL"
+}
+
+fun sum(arg:Int, f : fun () : Int) : Int {
+    return arg + f()
+}
diff --git a/translator/testFiles/examples/cases/funDelegation.jet b/translator/testFiles/examples/cases/funDelegation.jet
new file mode 100644
index 00000000000..10a1f408b09
--- /dev/null
+++ b/translator/testFiles/examples/cases/funDelegation.jet
@@ -0,0 +1,17 @@
+open class Base() {
+    fun n(n : Int) : Int = n + 1
+}
+
+trait Abstract {}
+
+class Derived1() : Base(), Abstract {}
+class Derived2() : Abstract, Base() {}
+
+fun test(s : Base) : Boolean = s.n(238) == 239
+
+fun box() : String {
+    if (!test(Base())) return "Fail #1"
+    if (!test(Derived1())) return "Fail #2"
+    if (!test(Derived2())) return "Fail #3"
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/examples/cases/initializerBlock.jet b/translator/testFiles/examples/cases/initializerBlock.jet
new file mode 100644
index 00000000000..c89deeda87d
--- /dev/null
+++ b/translator/testFiles/examples/cases/initializerBlock.jet
@@ -0,0 +1,13 @@
+class C() {
+  public var f: Int
+
+  {
+    $f = 610
+  }
+}
+
+fun box(): String {
+  val c = C()
+  if (c.f != 610) return "fail"
+  return "OK"
+}
diff --git a/translator/testFiles/examples/cases/kt242.jet b/translator/testFiles/examples/cases/kt242.jet
new file mode 100644
index 00000000000..4e2de93cff3
--- /dev/null
+++ b/translator/testFiles/examples/cases/kt242.jet
@@ -0,0 +1,19 @@
+fun box() : String {
+    val i: Int? = 7
+    val j: Int? = null
+    val k = 7
+
+    //verify errors
+    if (i == 7) {}
+    if (7 == i) {}
+
+    if (j == 7) {}
+    if (7 == j) {}
+
+    if (i == k) {}
+    if (k == i) {}
+
+    if (j == k) {}
+    if (k == j) {}
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet b/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet
new file mode 100644
index 00000000000..6cd0ebd954b
--- /dev/null
+++ b/translator/testFiles/examples/cases/newInstanceDefaultConstructor.jet
@@ -0,0 +1,11 @@
+class SimpleClass() {
+    fun foo() = 610
+}
+
+fun box() : String {
+  val c = SimpleClass()
+  if (c.foo() == 610) {
+    return "OK"
+  }
+  return "FAIL"
+}
diff --git a/translator/testFiles/examples/cases/propertyDelegation.jet b/translator/testFiles/examples/cases/propertyDelegation.jet
new file mode 100644
index 00000000000..614c624f124
--- /dev/null
+++ b/translator/testFiles/examples/cases/propertyDelegation.jet
@@ -0,0 +1,33 @@
+open class Base() {
+    val plain = 239
+    public val read : Int
+      get() = 239
+
+    public var readwrite : Int = 0
+      get() = $readwrite + 1
+      set(n : Int) {
+        $readwrite = n
+      }
+}
+
+trait Abstract {}
+
+class Derived1() : Base(), Abstract {}
+class Derived2() : Abstract, Base() {}
+
+fun code(s : Base) : Int {
+    if (s.plain != 239) return 1
+    if (s.read != 239) return 2
+    s.readwrite = 238
+    if (s.readwrite != 239) return 3
+    return 0
+}
+
+fun test(s : Base) : Boolean = code(s) == 0
+
+fun box() : String {
+    if (!test(Base())) return "Fail #1"
+    if (!test(Derived1())) return "Fail #2"
+    if (!test(Derived2())) return "Fail #3"
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/examples/cases/rightHandOverride.jet b/translator/testFiles/examples/cases/rightHandOverride.jet
new file mode 100644
index 00000000000..e99e60bd863
--- /dev/null
+++ b/translator/testFiles/examples/cases/rightHandOverride.jet
@@ -0,0 +1,20 @@
+// Changed when traits were introduced. May not make sense any more
+
+trait Left {}
+open class Right() {
+    open fun f() = 42
+}
+
+class D() : Left, Right() {
+    override fun f() = 239
+}
+
+fun box() : String {
+    val r : Right = Right()
+    val d : D = D()
+
+    if (r.f() != 42) return "Fail #1"
+    if (d.f() != 239) return "Fail #2"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/examples/cases/simplestClosure.jet b/translator/testFiles/examples/cases/simplestClosure.jet
new file mode 100644
index 00000000000..c851416e4f1
--- /dev/null
+++ b/translator/testFiles/examples/cases/simplestClosure.jet
@@ -0,0 +1,7 @@
+fun box() : String {
+    return invoker( {"OK"} )
+}
+
+fun invoker(gen : fun () : String) : String {
+    return gen()
+}
diff --git a/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet b/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet
new file mode 100644
index 00000000000..8e3bedb2f37
--- /dev/null
+++ b/translator/testFiles/examples/cases/simplestClosureAndBoxing.jet
@@ -0,0 +1,7 @@
+fun box() : String {
+    return if (int_invoker( { 7 } ) == 7) "OK" else "fail"
+}
+
+fun int_invoker(gen : fun () : Int) : Int {
+    return gen()
+}
diff --git a/translator/testFiles/sortedTests/failed/enclosingThis.jet b/translator/testFiles/sortedTests/failed/enclosingThis.jet
new file mode 100644
index 00000000000..93ae48c580f
--- /dev/null
+++ b/translator/testFiles/sortedTests/failed/enclosingThis.jet
@@ -0,0 +1,12 @@
+class Point(val x:Int, val y:Int) {
+    fun mul() : fun (scalar:Int):Point  {
+        return { (scalar:Int):Point => Point(x * scalar, y * scalar) }
+    }
+}
+
+val m = Point(2, 3).mul() : fun (scalar:Int):Point
+
+fun box() : String {
+    val answer = m(5)
+    return if (answer.x == 10 && answer.y == 15) "OK" else "FAIL"
+}
diff --git a/translator/testFiles/sortedTests/failed/simpleBox.jet b/translator/testFiles/sortedTests/failed/simpleBox.jet
new file mode 100644
index 00000000000..be95d012d51
--- /dev/null
+++ b/translator/testFiles/sortedTests/failed/simpleBox.jet
@@ -0,0 +1,8 @@
+class Box<T>(t: T) {
+    var value = t
+}
+
+fun box(): String {
+    val box: Box<Int> = Box<Int>(1)
+    return if (box.value == 1) "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/obscure/inheritedMethod.jet b/translator/testFiles/sortedTests/obscure/inheritedMethod.jet
new file mode 100644
index 00000000000..597910dc7b4
--- /dev/null
+++ b/translator/testFiles/sortedTests/obscure/inheritedMethod.jet
@@ -0,0 +1,13 @@
+open class Foo {
+  fun xyzzy(): String = "xyzzy"
+}
+
+class Bar(): Foo {
+  fun test(): String = xyzzy()
+}
+
+fun box() : String {
+  val bar = Bar()
+  val f = bar.test()
+  return if (f == "xyzzy") "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet b/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet
new file mode 100644
index 00000000000..ab6117e266e
--- /dev/null
+++ b/translator/testFiles/sortedTests/unexpectedError/exceptionConstructor.jet
@@ -0,0 +1,7 @@
+class GameError(msg: String): Exception(msg) {
+}
+
+fun box(): String {
+  val e = GameError("foo")
+  return if (e.getMessage() == "foo") "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/unsupported/basicproperty.jet b/translator/testFiles/sortedTests/unsupported/basicproperty.jet
new file mode 100644
index 00000000000..196ed3f40b0
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/basicproperty.jet
@@ -0,0 +1,22 @@
+open class M() {
+    open var b: Int = 0
+}
+
+class N() : M() {
+    val a : Int
+        get() {
+            super.b = super.b + 1
+            return super.b + 1
+        }
+    override var b: Int = a + 1
+
+    val superb : Int
+        get() = super.b
+}
+
+fun box(): String {
+    val n = N()
+    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
+    return "fail";
+}
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/unsupported/classObject.jet b/translator/testFiles/sortedTests/unsupported/classObject.jet
new file mode 100644
index 00000000000..76eff77c438
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/classObject.jet
@@ -0,0 +1,11 @@
+class C() {
+  class object {
+    fun create() = C()
+  }
+}
+
+fun box(): String {
+  val c = C.create()
+  return if (c is C) "OK" else "fail"
+}
+
diff --git a/translator/testFiles/sortedTests/unsupported/classObjectInterface.jet b/translator/testFiles/sortedTests/unsupported/classObjectInterface.jet
new file mode 100644
index 00000000000..432bb37bee0
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/classObjectInterface.jet
@@ -0,0 +1,9 @@
+class C() {
+  fun getInstance(): Runnable = C
+
+  class object: Runnable {
+    override fun run(): Unit { }
+  }
+}
+
+fun foo() = C().getInstance()
diff --git a/translator/testFiles/sortedTests/unsupported/classObjectMethod.jet b/translator/testFiles/sortedTests/unsupported/classObjectMethod.jet
new file mode 100644
index 00000000000..d7d70a86d96
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/classObjectMethod.jet
@@ -0,0 +1,13 @@
+abstract open class Default {
+  abstract fun defaultValue(): Int
+}
+
+class MyInt() {
+  class object : Default {
+    override fun defaultValue(): Int = 610
+  }
+}
+
+fun toDefault<T: Any>(t: T) where class object T: Default = T.defaultValue()
+
+fun box(): String = if (toDefault<MyInt>(MyInt()) == 610) "OK" else "fail"
diff --git a/translator/testFiles/sortedTests/unsupported/enclosed.jet b/translator/testFiles/sortedTests/unsupported/enclosed.jet
new file mode 100644
index 00000000000..705e0b602c2
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/enclosed.jet
@@ -0,0 +1,42 @@
+trait BK {
+    fun x() : Int = 50
+}
+
+trait K : BK {
+    override fun x() : Int = super.x() * 2
+}
+
+open class M() {
+    open fun x() : Int = 10
+
+    open var y = 500
+}
+
+open class N() : M(), K {
+
+    override fun x() : Int = 20
+
+    override var y = 200
+
+    open class C() : K {
+        fun test1() = x()
+        fun test2() = super<M>@N.x()
+        fun test3() = super<K>@N.x()
+        fun test4() = super<K>.x()
+        fun test5() = y
+        fun test6() : Int {
+            super<M>@N.y += 200
+            return super<M>@N.y
+        }
+    }
+}
+
+fun box(): String {
+    if (N().C().test1() != 100) return "test1 fail";
+    if (N().C().test2() != 10)  return "test2 fail";
+    if (N().C().test3() != 100) return "test3 fail";
+    if (N().C().test4() != 100) return "test4 fail";
+    if (N().C().test5() != 200) return "test5 fail";
+    if (N().C().test6() != 700) return "test6 fail";
+    return "OK";
+}
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/unsupported/extensionClosure.jet b/translator/testFiles/sortedTests/unsupported/extensionClosure.jet
new file mode 100644
index 00000000000..11fd11b3816
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/extensionClosure.jet
@@ -0,0 +1,13 @@
+class Point(val x : Int, val y : Int)
+
+fun box() : String {
+    val answer = apply(Point(3, 5), { Point.(scalar : Int) : Point =>
+        Point(x * scalar, y * scalar)
+    })
+
+    return if (answer.x == 6 && answer.y == 10) "OK" else "FAIL"
+}
+
+fun apply(arg:Point, f : fun Point.(scalar : Int) : Point) : Point {
+    return arg.f(2)
+}
diff --git a/translator/testFiles/sortedTests/unsupported/inheritance.jet b/translator/testFiles/sortedTests/unsupported/inheritance.jet
new file mode 100644
index 00000000000..0bfdb4e497f
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/inheritance.jet
@@ -0,0 +1,41 @@
+// Changed when traits were introduced. May not make sense any more
+
+open class X(val x : Int) {}
+trait Y {
+    abstract val y : Int
+}
+
+class YImpl(override val y : Int) : Y {}
+
+class Point(x : Int, yy : Int) : X(x) , Y {
+    override val y : Int = yy
+}
+
+trait Abstract {}
+
+class P1(x : Int, yy : Y) : Abstract, X(x), Y by yy {}
+class P2(x : Int, yy : Y) : X(x), Abstract, Y by yy {}
+class P3(x : Int, yy : Y) : X(x), Y by yy, Abstract {}
+class P4(x : Int, yy : Y) : Y by yy, Abstract, X(x) {}
+
+fun box() : String {
+    if (X(239).x != 239) return "FAIL #1"
+    if (YImpl(239).y != 239) return "FAIL #2"
+
+    val p = Point(240, -1)
+    if (p.x + p.y != 239) return "FAIL #3"
+
+    val y = YImpl(-1)
+    val p1 = P1(240, y)
+    if (p1.x + p1.y != 239) return "FAIL #4"
+    val p2 = P2(240, y)
+    if (p2.x + p2.y != 239) return "FAIL #5"
+
+    val p3 = P3(240, y)
+    if (p3.x + p3.y != 239) return "FAIL #6"
+
+    val p4 = P4(240, y)
+    if (p4.x + p4.y != 239) return "FAIL #7"
+
+    return "OK"
+}
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet b/translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet
new file mode 100644
index 00000000000..4717bea55a8
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/inheritedInnerClass.jet
@@ -0,0 +1,14 @@
+class Outer() {
+  open class InnerBase() {
+  }
+
+  class InnerDerived(): InnerBase() {
+  }
+
+  public val foo: InnerBase? = InnerDerived()
+}
+
+fun box() : String {
+  val o = Outer()
+  return if (o.foo === null) "fail" else "OK"
+}
diff --git a/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet b/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet
new file mode 100644
index 00000000000..f6e84b15afd
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/propertyInInitializer.jet
@@ -0,0 +1,16 @@
+class Outer() {
+  val s = "xyzzy"
+
+  open class InnerBase(public val name: String) {
+  }
+
+  class InnerDerived(): InnerBase(s) {
+  }
+
+  val x = InnerDerived()
+}
+
+fun box() : String {
+  val o = Outer()
+  return if (o.x.name != "xyzzy") "fail" else "OK"
+}
diff --git a/translator/testFiles/sortedTests/unsupported/traitproperty.jet b/translator/testFiles/sortedTests/unsupported/traitproperty.jet
new file mode 100644
index 00000000000..962f71c5dc9
--- /dev/null
+++ b/translator/testFiles/sortedTests/unsupported/traitproperty.jet
@@ -0,0 +1,29 @@
+trait M {
+    var backingB : Int
+    var b : Int
+        get() = backingB
+        set(value: Int) {
+            backingB = value
+        }
+}
+
+class N() : M {
+    override var backingB : Int = 0
+
+    val a : Int
+        get() {
+            super.b = super.b + 1
+            return super.b + 1
+        }
+    override var b: Int = a + 1
+
+    val superb : Int
+        get() = super.b
+}
+
+fun box(): String {
+    val n = N()
+    System.out?.println("a: " + n.a + " b: " + n.b + " superb: " + n.superb)
+    if (n.b == 3 && n.a == 4 && n.superb == 3) return "OK";
+    return "fail";
+}
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/usesJava/basicmethod.jet b/translator/testFiles/sortedTests/usesJava/basicmethod.jet
new file mode 100644
index 00000000000..9920bc3b69d
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/basicmethod.jet
@@ -0,0 +1,21 @@
+import java.util.ArrayList
+
+trait Tr {
+   fun extra() : String = "_"
+}
+
+class N() : ArrayList<Any>(), Tr {
+    override fun add(el: Any)  : Boolean {
+        super<ArrayList>.add(el)
+        return super<ArrayList>.add(el.toString() + super<Tr>.extra() + el + extra())
+    }
+
+   override fun extra() : String = super<Tr>.extra() + super<Tr>.extra()
+}
+
+fun box(): String {
+    val n = N()
+    n.add("239")
+    if (n.get(0) == "239" && n.get(1) == "239_239__") return "OK";
+    return "fail";
+}
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet b/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet
new file mode 100644
index 00000000000..d0ee9df62d0
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/inheritingFromArrayList.jet
@@ -0,0 +1 @@
+class Foo() : java.util.ArrayList<Int>()
\ No newline at end of file
diff --git a/translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet b/translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet
new file mode 100644
index 00000000000..aa3d227c80f
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/initializerBlockDImpl.jet
@@ -0,0 +1,20 @@
+import java.util.*
+import java.io.*
+
+class World() {
+  public val items: ArrayList<Item> = ArrayList<Item>
+
+  class Item() {
+    {
+      items.add(this)
+    }
+  }
+
+  val foo = Item()
+}
+
+fun box() : String {
+  val w = World()
+  if (w.items.size() != 1) return "fail"
+  return "OK"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/innerClass.jet b/translator/testFiles/sortedTests/usesJava/innerClass.jet
new file mode 100644
index 00000000000..df43f61e8bc
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/innerClass.jet
@@ -0,0 +1,19 @@
+class Outer(val foo: StringBuilder) {
+  class Inner() {
+    fun len() : Int {
+      return foo.length()
+    }
+  }
+
+  fun test() : Inner {
+    return Inner()
+  }
+}
+
+fun box() : String {
+  val sb = StringBuilder("xyzzy")
+  val o = Outer(sb)
+  val i = o.test()
+  val l = i.len()
+  return if (l != 5) "fail" else "OK"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet b/translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet
new file mode 100644
index 00000000000..bee66062979
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/overloadBinaryOperator.jet
@@ -0,0 +1,25 @@
+import java.util.*
+
+class ArrayWrapper<T>() {
+    val contents = ArrayList<T>()
+
+    fun add(item: T) {
+       contents.add(item)
+    }
+
+    fun plus(b: ArrayWrapper<T>): ArrayWrapper<T> {
+        val result = ArrayWrapper<T>()
+        result.contents.addAll(contents)
+        result.contents.addAll(b.contents)
+        return result
+    }
+}
+
+fun box(): String {
+    val v1 = ArrayWrapper<String>()
+    val v2 = ArrayWrapper<String>()
+    v1.add("foo")
+    v2.add("bar")
+    val v3 = v1 + v2
+    return if (v3.contents.size() == 2) "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet b/translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet
new file mode 100644
index 00000000000..5247973e8d6
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/overloadPlusAssign.jet
@@ -0,0 +1,26 @@
+import java.util.*
+
+class ArrayWrapper<T>() {
+    val contents = ArrayList<T>()
+
+    fun add(item: T) {
+        contents.add(item)
+    }
+
+    fun plusAssign(rhs: ArrayWrapper<T>) {
+        contents.addAll(rhs.contents)
+    }
+
+    fun get(index: Int): T {
+        return contents.get(index)
+    }
+}
+
+fun box(): String {
+    var v1 = ArrayWrapper<String>()
+    val v2 = ArrayWrapper<String>()
+    v1.add("foo")
+    v2.add("bar")
+    v1 += v2
+    return if (v1.contents.size() == 2) "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet b/translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet
new file mode 100644
index 00000000000..42671b9f138
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/overloadPlusAssignReturn.jet
@@ -0,0 +1,30 @@
+import java.util.*
+
+class ArrayWrapper<T>() {
+    val contents = ArrayList<T>()
+
+    fun add(item: T) {
+        contents.add(item)
+    }
+
+    fun plusAssign(rhs: ArrayWrapper<T>): ArrayWrapper<T> {
+        val result = ArrayWrapper<T>()
+        result.contents.addAll(contents)
+        result.contents.addAll(rhs.contents)
+        return result
+    }
+
+    fun get(index: Int): T {
+        return contents.get(index)
+    }
+}
+
+fun box(): String {
+    var v1 = ArrayWrapper<String>()
+    val v2 = ArrayWrapper<String>()
+    v1.add("foo")
+    val v3 = v1
+    v2.add("bar")
+    v1 += v2
+    return if (v1.contents.size() == 2 && v3.contents.size() == 1) "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet b/translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet
new file mode 100644
index 00000000000..c5236b0ace4
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/overloadPlusToPlusAssign.jet
@@ -0,0 +1,30 @@
+import java.util.*
+
+class ArrayWrapper<T>() {
+    val contents = ArrayList<T>()
+
+    fun add(item: T) {
+        contents.add(item)
+    }
+
+    fun plus(rhs: ArrayWrapper<T>): ArrayWrapper<T> {
+        val result = ArrayWrapper<T>()
+        result.contents.addAll(contents)
+        result.contents.addAll(rhs.contents)
+        return result
+    }
+
+    fun get(index: Int): T {
+        return contents.get(index)
+    }
+}
+
+fun box(): String {
+    var v1 = ArrayWrapper<String>()
+    val v2 = ArrayWrapper<String>()
+    v1.add("foo")
+    val v3 = v1
+    v2.add("bar")
+    v1 += v2
+    return if (v1.contents.size() == 2 && v3.contents.size() == 1) "OK" else "fail"
+}
diff --git a/translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet b/translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet
new file mode 100644
index 00000000000..120f84a2746
--- /dev/null
+++ b/translator/testFiles/sortedTests/usesJava/overloadUnaryOperator.jet
@@ -0,0 +1,28 @@
+import java.util.*
+
+class ArrayWrapper<T>() {
+    val contents = ArrayList<T>()
+
+    fun add(item: T) {
+       contents.add(item)
+    }
+
+    fun minus(): ArrayWrapper<T> {
+        val result = ArrayWrapper<T>()
+        result.contents.addAll(contents)
+        Collections.reverse(result.contents)
+        return result
+    }
+
+    fun get(index: Int): T {
+        return contents.get(index)
+    }
+}
+
+fun box(): String {
+    val v1 = ArrayWrapper<String>()
+    v1.add("foo")
+    v1.add("bar")
+    val v2 = -v1
+    return if (v2[0] == "bar" && v2[1] == "foo") "OK" else "fail"
+}
diff --git a/translator/translator.iml b/translator/translator.iml
index 7d89d03133f..18261b47b3f 100644
--- a/translator/translator.iml
+++ b/translator/translator.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/examples" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />