diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java
index ebfc8612a97..7e5b0cc5fc6 100644
--- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.asJava;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/asJava/lightClasses")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({KotlinLightClassTestGenerated.Delegation.class, KotlinLightClassTestGenerated.NullabilityAnnotations.class})
 public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest {
     public void testAllFilesPresentInLightClasses() throws Exception {
@@ -35,6 +37,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
     }
     
     @TestMetadata("compiler/testData/asJava/lightClasses/delegation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Delegation extends AbstractKotlinLightClassTest {
         public void testAllFilesPresentInDelegation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,17 +45,20 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
         
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Function.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/delegation/Property.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NullabilityAnnotations extends AbstractKotlinLightClassTest {
         public void testAllFilesPresentInNullabilityAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -60,92 +66,110 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest
         
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectField.kt")
         public void testClassObjectField() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassObjectField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithConstructor.kt")
         public void testClassWithConstructor() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithConstructorAndProperties.kt")
         public void testClassWithConstructorAndProperties() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/ClassWithConstructorAndProperties.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Generic.kt")
         public void testGeneric() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Generic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntOverridesAny.kt")
         public void testIntOverridesAny() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/IntOverridesAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableUnitReturn.kt")
         public void testNullableUnitReturn() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/NullableUnitReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideAnyWithUnit.kt")
         public void testOverrideAnyWithUnit() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Primitives.kt")
         public void testPrimitives() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Primitives.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateInClass.kt")
         public void testPrivateInClass() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateInTrait.kt")
         public void testPrivateInTrait() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/PrivateInTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Synthetic.kt")
         public void testSynthetic() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Synthetic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/Trait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitClassObjectField.kt")
         public void testTraitClassObjectField() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitAsGenericArgument.kt")
         public void testUnitAsGenericArgument() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitParameter.kt")
         public void testUnitParameter() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VoidReturn.kt")
         public void testVoidReturn() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/VoidReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("_DefaultPackage.kt")
         public void test_DefaultPackage() throws Exception {
-            doTest("compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations/_DefaultPackage.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
index 1fbfbe4cef0..1e8c427734b 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/cfg")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ControlFlowTestGenerated.Arrays.class, ControlFlowTestGenerated.Basic.class, ControlFlowTestGenerated.Bugs.class, ControlFlowTestGenerated.ControlStructures.class, ControlFlowTestGenerated.Conventions.class, ControlFlowTestGenerated.DeadCode.class, ControlFlowTestGenerated.Declarations.class, ControlFlowTestGenerated.Expressions.class, ControlFlowTestGenerated.Functions.class, ControlFlowTestGenerated.TailCalls.class})
 public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     public void testAllFilesPresentInCfg() throws Exception {
@@ -35,6 +37,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg/arrays")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Arrays extends AbstractControlFlowTest {
         public void testAllFilesPresentInArrays() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,37 +45,44 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("ArrayAccess.kt")
         public void testArrayAccess() throws Exception {
-            doTest("compiler/testData/cfg/arrays/ArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayAccessExpression.kt")
         public void testArrayAccessExpression() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayInc.kt")
         public void testArrayInc() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arrayInc.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfFunctions.kt")
         public void testArrayOfFunctions() throws Exception {
-            doTest("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arraySet.kt")
         public void testArraySet() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arraySet.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arraySetPlusAssign.kt")
         public void testArraySetPlusAssign() throws Exception {
-            doTest("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/basic")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Basic extends AbstractControlFlowTest {
         public void testAllFilesPresentInBasic() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,22 +90,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("Basic.kt")
         public void testBasic() throws Exception {
-            doTest("compiler/testData/cfg/basic/Basic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EmptyFunction.kt")
         public void testEmptyFunction() throws Exception {
-            doTest("compiler/testData/cfg/basic/EmptyFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ShortFunction.kt")
         public void testShortFunction() throws Exception {
-            doTest("compiler/testData/cfg/basic/ShortFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/bugs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Bugs extends AbstractControlFlowTest {
         public void testAllFilesPresentInBugs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -103,12 +117,14 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("jumpToOuterScope.kt")
         public void testJumpToOuterScope() throws Exception {
-            doTest("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/controlStructures")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ControlStructures extends AbstractControlFlowTest {
         public void testAllFilesPresentInControlStructures() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -116,57 +132,68 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("continueInDoWhile.kt")
         public void testContinueInDoWhile() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInFor.kt")
         public void testContinueInFor() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInWhile.kt")
         public void testContinueInWhile() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Finally.kt")
         public void testFinally() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/Finally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FinallyTestCopy.kt")
         public void testFinallyTestCopy() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("For.kt")
         public void testFor() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/For.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("If.kt")
         public void testIf() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/If.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OnlyWhileInFunctionBody.kt")
         public void testOnlyWhileInFunctionBody() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnsInWhen.kt")
         public void testReturnsInWhen() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenConditions.kt")
         public void testWhenConditions() throws Exception {
-            doTest("compiler/testData/cfg/controlStructures/whenConditions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/conventions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Conventions extends AbstractControlFlowTest {
         public void testAllFilesPresentInConventions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -174,32 +201,38 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("bothReceivers.kt")
         public void testBothReceivers() throws Exception {
-            doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doTest("compiler/testData/cfg/conventions/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incrementAtTheEnd.kt")
         public void testIncrementAtTheEnd() throws Exception {
-            doTest("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invoke.kt")
         public void testInvoke() throws Exception {
-            doTest("compiler/testData/cfg/conventions/invoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notEqual.kt")
         public void testNotEqual() throws Exception {
-            doTest("compiler/testData/cfg/conventions/notEqual.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/deadCode")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DeadCode extends AbstractControlFlowTest {
         public void testAllFilesPresentInDeadCode() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -207,22 +240,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("DeadCode.kt")
         public void testDeadCode() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/DeadCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInElvis.kt")
         public void testReturnInElvis() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/returnInElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringTemplate.kt")
         public void testStringTemplate() throws Exception {
-            doTest("compiler/testData/cfg/deadCode/stringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/declarations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class})
     public static class Declarations extends AbstractControlFlowTest {
         public void testAllFilesPresentInDeclarations() throws Exception {
@@ -230,6 +267,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassesAndObjects extends AbstractControlFlowTest {
             public void testAllFilesPresentInClassesAndObjects() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -237,22 +275,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("AnonymousInitializers.kt")
             public void testAnonymousInitializers() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegationByExpression.kt")
             public void testDelegationByExpression() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegationBySuperCall.kt")
             public void testDelegationBySuperCall() throws Exception {
-                doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/functionLiterals")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionLiterals extends AbstractControlFlowTest {
             public void testAllFilesPresentInFunctionLiterals() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -260,12 +302,14 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("unusedFunctionLiteral.kt")
             public void testUnusedFunctionLiteral() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/functions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Functions extends AbstractControlFlowTest {
             public void testAllFilesPresentInFunctions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -273,17 +317,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("FailFunction.kt")
             public void testFailFunction() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeParameter.kt")
             public void testTypeParameter() throws Exception {
-                doTest("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/local")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Local extends AbstractControlFlowTest {
             public void testAllFilesPresentInLocal() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -291,27 +338,32 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LocalDeclarations.kt")
             public void testLocalDeclarations() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localProperty.kt")
             public void testLocalProperty() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/localProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectExpression.kt")
             public void testObjectExpression() throws Exception {
-                doTest("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration")
+        @TestDataPath("$PROJECT_ROOT")
         public static class MultiDeclaration extends AbstractControlFlowTest {
             public void testAllFilesPresentInMultiDeclaration() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -319,17 +371,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("MultiDecl.kt")
             public void testMultiDecl() throws Exception {
-                doTest("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multiDeclarationWithError.kt")
             public void testMultiDeclarationWithError() throws Exception {
-                doTest("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations/properties")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Properties extends AbstractControlFlowTest {
             public void testAllFilesPresentInProperties() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -337,22 +392,26 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
             
             @TestMetadata("backingFieldAccess.kt")
             public void testBackingFieldAccess() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("backingFieldQualifiedWithThis.kt")
             public void testBackingFieldQualifiedWithThis() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegatedProperty.kt")
             public void testDelegatedProperty() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unreachableDelegation.kt")
             public void testUnreachableDelegation() throws Exception {
-                doTest("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                doTest(fileName);
             }
             
         }
@@ -371,6 +430,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractControlFlowTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -378,107 +438,128 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("assignmentToThis.kt")
         public void testAssignmentToThis() throws Exception {
-            doTest("compiler/testData/cfg/expressions/assignmentToThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Assignments.kt")
         public void testAssignments() throws Exception {
-            doTest("compiler/testData/cfg/expressions/Assignments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callableReferences.kt")
         public void testCallableReferences() throws Exception {
-            doTest("compiler/testData/cfg/expressions/callableReferences.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("casts.kt")
         public void testCasts() throws Exception {
-            doTest("compiler/testData/cfg/expressions/casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("chainedQualifiedExpression.kt")
         public void testChainedQualifiedExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expressionAsFunction.kt")
         public void testExpressionAsFunction() throws Exception {
-            doTest("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incdec.kt")
         public void testIncdec() throws Exception {
-            doTest("compiler/testData/cfg/expressions/incdec.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidVariableCall.kt")
         public void testInvalidVariableCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LazyBooleans.kt")
         public void testLazyBooleans() throws Exception {
-            doTest("compiler/testData/cfg/expressions/LazyBooleans.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nothingExpr.kt")
         public void testNothingExpr() throws Exception {
-            doTest("compiler/testData/cfg/expressions/nothingExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesizedSelector.kt")
         public void testParenthesizedSelector() throws Exception {
-            doTest("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertySafeCall.kt")
         public void testPropertySafeCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/propertySafeCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("qualifiedExpressionWithoutSelector.kt")
         public void testQualifiedExpressionWithoutSelector() throws Exception {
-            doTest("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ReturnFromExpression.kt")
         public void testReturnFromExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisExpression.kt")
         public void testThisExpression() throws Exception {
-            doTest("compiler/testData/cfg/expressions/thisExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedCall.kt")
         public void testUnresolvedCall() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedProperty.kt")
         public void testUnresolvedProperty() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unresolvedWriteLHS.kt")
         public void testUnresolvedWriteLHS() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unsupportedReturns.kt")
         public void testUnsupportedReturns() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unusedExpressionSimpleName.kt")
         public void testUnusedExpressionSimpleName() throws Exception {
-            doTest("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/functions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Functions extends AbstractControlFlowTest {
         public void testAllFilesPresentInFunctions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -486,17 +567,20 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("DefaultValuesForArguments.kt")
         public void testDefaultValuesForArguments() throws Exception {
-            doTest("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unmappedArgs.kt")
         public void testUnmappedArgs() throws Exception {
-            doTest("compiler/testData/cfg/functions/unmappedArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg/tailCalls")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TailCalls extends AbstractControlFlowTest {
         public void testAllFilesPresentInTailCalls() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -504,27 +588,32 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {
         
         @TestMetadata("finally.kt")
         public void testFinally() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/finally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("finallyWithReturn.kt")
         public void testFinallyWithReturn() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sum.kt")
         public void testSum() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/sum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("try.kt")
         public void testTry() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/try.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryCatchFinally.kt")
         public void testTryCatchFinally() throws Exception {
-            doTest("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java
index 3b34743dd62..dfd65de8bcb 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/cfg-variables")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({DataFlowTestGenerated.Basic.class, DataFlowTestGenerated.Bugs.class, DataFlowTestGenerated.LexicalScopes.class})
 public class DataFlowTestGenerated extends AbstractDataFlowTest {
     public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -35,6 +37,7 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
     }
     
     @TestMetadata("compiler/testData/cfg-variables/basic")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Basic extends AbstractDataFlowTest {
         public void testAllFilesPresentInBasic() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,32 +45,38 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("IfWithUninitialized.kt")
         public void testIfWithUninitialized() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InitializedNotDeclared.kt")
         public void testInitializedNotDeclared() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UsageInFunctionLiteral.kt")
         public void testUsageInFunctionLiteral() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariablesInitialization.kt")
         public void testVariablesInitialization() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariablesUsage.kt")
         public void testVariablesUsage() throws Exception {
-            doTest("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg-variables/bugs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Bugs extends AbstractDataFlowTest {
         public void testAllFilesPresentInBugs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -75,22 +84,26 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("referenceToPropertyInitializer.kt")
         public void testReferenceToPropertyInitializer() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varInitializationInIf.kt")
         public void testVarInitializationInIf() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varInitializationInIfInCycle.kt")
         public void testVarInitializationInIfInCycle() throws Exception {
-            doTest("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/cfg-variables/lexicalScopes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LexicalScopes extends AbstractDataFlowTest {
         public void testAllFilesPresentInLexicalScopes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -98,62 +111,74 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest {
         
         @TestMetadata("doWhileScope.kt")
         public void testDoWhileScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forScope.kt")
         public void testForScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralScope.kt")
         public void testFunctionLiteralScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifScope.kt")
         public void testIfScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localClass.kt")
         public void testLocalClass() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionScope.kt")
         public void testLocalFunctionScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionScopeWithoutBody.kt")
         public void testLocalFunctionScopeWithoutBody() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localObject.kt")
         public void testLocalObject() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectLiteralScope.kt")
         public void testObjectLiteralScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorScope.kt")
         public void testPropertyAccessorScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryScope.kt")
         public void testTryScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whileScope.kt")
         public void testWhileScope() throws Exception {
-            doTest("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
index a3bcb50a244..95a14c36b39 100644
--- a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cfg;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({PseudoValueTestGenerated.Cfg.class, PseudoValueTestGenerated.Cfg_variables.class})
 public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
     @TestMetadata("compiler/testData/cfg")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Cfg.Arrays.class, Cfg.Basic.class, Cfg.Bugs.class, Cfg.ControlStructures.class, Cfg.Conventions.class, Cfg.DeadCode.class, Cfg.Declarations.class, Cfg.Expressions.class, Cfg.Functions.class, Cfg.TailCalls.class})
     public static class Cfg extends AbstractPseudoValueTest {
         public void testAllFilesPresentInCfg() throws Exception {
@@ -37,6 +39,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg/arrays")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Arrays extends AbstractPseudoValueTest {
             public void testAllFilesPresentInArrays() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -44,37 +47,44 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("ArrayAccess.kt")
             public void testArrayAccess() throws Exception {
-                doTest("compiler/testData/cfg/arrays/ArrayAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arrayAccessExpression.kt")
             public void testArrayAccessExpression() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayAccessExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arrayInc.kt")
             public void testArrayInc() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arrayInc.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arrayInc.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfFunctions.kt")
             public void testArrayOfFunctions() throws Exception {
-                doTest("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/ArrayOfFunctions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arraySet.kt")
             public void testArraySet() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arraySet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("arraySetPlusAssign.kt")
             public void testArraySetPlusAssign() throws Exception {
-                doTest("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/arrays/arraySetPlusAssign.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/basic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Basic extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -82,22 +92,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("Basic.kt")
             public void testBasic() throws Exception {
-                doTest("compiler/testData/cfg/basic/Basic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/Basic.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EmptyFunction.kt")
             public void testEmptyFunction() throws Exception {
-                doTest("compiler/testData/cfg/basic/EmptyFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/EmptyFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShortFunction.kt")
             public void testShortFunction() throws Exception {
-                doTest("compiler/testData/cfg/basic/ShortFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/basic/ShortFunction.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/bugs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Bugs extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBugs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -105,12 +119,14 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("jumpToOuterScope.kt")
             public void testJumpToOuterScope() throws Exception {
-                doTest("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/bugs/jumpToOuterScope.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/controlStructures")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ControlStructures extends AbstractPseudoValueTest {
             public void testAllFilesPresentInControlStructures() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -118,57 +134,68 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("continueInDoWhile.kt")
             public void testContinueInDoWhile() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInDoWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("continueInFor.kt")
             public void testContinueInFor() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("continueInWhile.kt")
             public void testContinueInWhile() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/continueInWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Finally.kt")
             public void testFinally() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/Finally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/Finally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FinallyTestCopy.kt")
             public void testFinallyTestCopy() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/FinallyTestCopy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("For.kt")
             public void testFor() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/For.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/For.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("If.kt")
             public void testIf() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/If.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/If.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OnlyWhileInFunctionBody.kt")
             public void testOnlyWhileInFunctionBody() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnsInWhen.kt")
             public void testReturnsInWhen() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/returnsInWhen.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenConditions.kt")
             public void testWhenConditions() throws Exception {
-                doTest("compiler/testData/cfg/controlStructures/whenConditions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/controlStructures/whenConditions.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/conventions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Conventions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInConventions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -176,32 +203,38 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("bothReceivers.kt")
             public void testBothReceivers() throws Exception {
-                doTest("compiler/testData/cfg/conventions/bothReceivers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/bothReceivers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("equals.kt")
             public void testEquals() throws Exception {
-                doTest("compiler/testData/cfg/conventions/equals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incrementAtTheEnd.kt")
             public void testIncrementAtTheEnd() throws Exception {
-                doTest("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invoke.kt")
             public void testInvoke() throws Exception {
-                doTest("compiler/testData/cfg/conventions/invoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/invoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notEqual.kt")
             public void testNotEqual() throws Exception {
-                doTest("compiler/testData/cfg/conventions/notEqual.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/deadCode")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeadCode extends AbstractPseudoValueTest {
             public void testAllFilesPresentInDeadCode() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -209,22 +242,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("DeadCode.kt")
             public void testDeadCode() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/DeadCode.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/DeadCode.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInElvis.kt")
             public void testReturnInElvis() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/returnInElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/returnInElvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("stringTemplate.kt")
             public void testStringTemplate() throws Exception {
-                doTest("compiler/testData/cfg/deadCode/stringTemplate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/deadCode/stringTemplate.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/declarations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class})
         public static class Declarations extends AbstractPseudoValueTest {
             public void testAllFilesPresentInDeclarations() throws Exception {
@@ -232,6 +269,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ClassesAndObjects extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInClassesAndObjects() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -239,22 +277,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("AnonymousInitializers.kt")
                 public void testAnonymousInitializers() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationByExpression.kt")
                 public void testDelegationByExpression() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationByExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationBySuperCall.kt")
                 public void testDelegationBySuperCall() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/classesAndObjects/delegationBySuperCall.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/functionLiterals")
+            @TestDataPath("$PROJECT_ROOT")
             public static class FunctionLiterals extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInFunctionLiterals() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -262,12 +304,14 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("unusedFunctionLiteral.kt")
                 public void testUnusedFunctionLiteral() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functionLiterals/unusedFunctionLiteral.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/functions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Functions extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInFunctions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -275,17 +319,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("FailFunction.kt")
                 public void testFailFunction() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/FailFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameter.kt")
                 public void testTypeParameter() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/functions/typeParameter.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/local")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Local extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInLocal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -293,27 +340,32 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalDeclarations.kt")
                 public void testLocalDeclarations() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/LocalDeclarations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localProperty.kt")
                 public void testLocalProperty() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/localProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/localProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ObjectExpression.kt")
                 public void testObjectExpression() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/local/ObjectExpression.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration")
+            @TestDataPath("$PROJECT_ROOT")
             public static class MultiDeclaration extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInMultiDeclaration() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -321,17 +373,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("MultiDecl.kt")
                 public void testMultiDecl() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/MultiDecl.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("multiDeclarationWithError.kt")
                 public void testMultiDeclarationWithError() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/multiDeclaration/multiDeclarationWithError.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/cfg/declarations/properties")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Properties extends AbstractPseudoValueTest {
                 public void testAllFilesPresentInProperties() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -339,22 +394,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
                 
                 @TestMetadata("backingFieldAccess.kt")
                 public void testBackingFieldAccess() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("backingFieldQualifiedWithThis.kt")
                 public void testBackingFieldQualifiedWithThis() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/backingFieldQualifiedWithThis.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/DelegatedProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("unreachableDelegation.kt")
                 public void testUnreachableDelegation() throws Exception {
-                    doTest("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/declarations/properties/unreachableDelegation.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -373,6 +432,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg/expressions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Expressions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInExpressions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -380,107 +440,128 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("assignmentToThis.kt")
             public void testAssignmentToThis() throws Exception {
-                doTest("compiler/testData/cfg/expressions/assignmentToThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/assignmentToThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Assignments.kt")
             public void testAssignments() throws Exception {
-                doTest("compiler/testData/cfg/expressions/Assignments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/Assignments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callableReferences.kt")
             public void testCallableReferences() throws Exception {
-                doTest("compiler/testData/cfg/expressions/callableReferences.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/callableReferences.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("casts.kt")
             public void testCasts() throws Exception {
-                doTest("compiler/testData/cfg/expressions/casts.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/casts.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("chainedQualifiedExpression.kt")
             public void testChainedQualifiedExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/chainedQualifiedExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("expressionAsFunction.kt")
             public void testExpressionAsFunction() throws Exception {
-                doTest("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/expressionAsFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incdec.kt")
             public void testIncdec() throws Exception {
-                doTest("compiler/testData/cfg/expressions/incdec.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/incdec.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invalidVariableCall.kt")
             public void testInvalidVariableCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/invalidVariableCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LazyBooleans.kt")
             public void testLazyBooleans() throws Exception {
-                doTest("compiler/testData/cfg/expressions/LazyBooleans.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/LazyBooleans.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nothingExpr.kt")
             public void testNothingExpr() throws Exception {
-                doTest("compiler/testData/cfg/expressions/nothingExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/nothingExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("parenthesizedSelector.kt")
             public void testParenthesizedSelector() throws Exception {
-                doTest("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/parenthesizedSelector.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertySafeCall.kt")
             public void testPropertySafeCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/propertySafeCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/propertySafeCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("qualifiedExpressionWithoutSelector.kt")
             public void testQualifiedExpressionWithoutSelector() throws Exception {
-                doTest("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/qualifiedExpressionWithoutSelector.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnFromExpression.kt")
             public void testReturnFromExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/ReturnFromExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisExpression.kt")
             public void testThisExpression() throws Exception {
-                doTest("compiler/testData/cfg/expressions/thisExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/thisExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedCall.kt")
             public void testUnresolvedCall() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedProperty.kt")
             public void testUnresolvedProperty() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedWriteLHS.kt")
             public void testUnresolvedWriteLHS() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unresolvedWriteLHS.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unsupportedReturns.kt")
             public void testUnsupportedReturns() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unsupportedReturns.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unusedExpressionSimpleName.kt")
             public void testUnusedExpressionSimpleName() throws Exception {
-                doTest("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/expressions/unusedExpressionSimpleName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/functions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Functions extends AbstractPseudoValueTest {
             public void testAllFilesPresentInFunctions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -488,17 +569,20 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("DefaultValuesForArguments.kt")
             public void testDefaultValuesForArguments() throws Exception {
-                doTest("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/DefaultValuesForArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedArgs.kt")
             public void testUnmappedArgs() throws Exception {
-                doTest("compiler/testData/cfg/functions/unmappedArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/functions/unmappedArgs.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg/tailCalls")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TailCalls extends AbstractPseudoValueTest {
             public void testAllFilesPresentInTailCalls() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -506,27 +590,32 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("finally.kt")
             public void testFinally() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/finally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("finallyWithReturn.kt")
             public void testFinallyWithReturn() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/finallyWithReturn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("sum.kt")
             public void testSum() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/sum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/sum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("try.kt")
             public void testTry() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/try.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/try.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryCatchFinally.kt")
             public void testTryCatchFinally() throws Exception {
-                doTest("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg/tailCalls/tryCatchFinally.kt");
+                doTest(fileName);
             }
             
         }
@@ -549,6 +638,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
     }
     
     @TestMetadata("compiler/testData/cfg-variables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Cfg_variables.Basic.class, Cfg_variables.Bugs.class, Cfg_variables.LexicalScopes.class})
     public static class Cfg_variables extends AbstractPseudoValueTest {
         public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -556,6 +646,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
         }
         
         @TestMetadata("compiler/testData/cfg-variables/basic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Basic extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -563,32 +654,38 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("IfWithUninitialized.kt")
             public void testIfWithUninitialized() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/IfWithUninitialized.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InitializedNotDeclared.kt")
             public void testInitializedNotDeclared() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/InitializedNotDeclared.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UsageInFunctionLiteral.kt")
             public void testUsageInFunctionLiteral() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VariablesInitialization.kt")
             public void testVariablesInitialization() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesInitialization.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VariablesUsage.kt")
             public void testVariablesUsage() throws Exception {
-                doTest("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/basic/VariablesUsage.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg-variables/bugs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Bugs extends AbstractPseudoValueTest {
             public void testAllFilesPresentInBugs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -596,22 +693,26 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("referenceToPropertyInitializer.kt")
             public void testReferenceToPropertyInitializer() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varInitializationInIf.kt")
             public void testVarInitializationInIf() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varInitializationInIfInCycle.kt")
             public void testVarInitializationInIfInCycle() throws Exception {
-                doTest("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/cfg-variables/lexicalScopes")
+        @TestDataPath("$PROJECT_ROOT")
         public static class LexicalScopes extends AbstractPseudoValueTest {
             public void testAllFilesPresentInLexicalScopes() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -619,62 +720,74 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
             
             @TestMetadata("doWhileScope.kt")
             public void testDoWhileScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/doWhileScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("forScope.kt")
             public void testForScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/forScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralScope.kt")
             public void testFunctionLiteralScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifScope.kt")
             public void testIfScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/ifScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionScope.kt")
             public void testLocalFunctionScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionScopeWithoutBody.kt")
             public void testLocalFunctionScopeWithoutBody() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localObject.kt")
             public void testLocalObject() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/localObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectLiteralScope.kt")
             public void testObjectLiteralScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyAccessorScope.kt")
             public void testPropertyAccessorScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryScope.kt")
             public void testTryScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/tryScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whileScope.kt")
             public void testWhileScope() throws Exception {
-                doTest("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/cfg-variables/lexicalScopes/whileScope.kt");
+                doTest(fileName);
             }
             
         }
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
index 7525ea46635..fe902014de2 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.checkers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,26 +31,31 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.TailRecursion.class, JetDiagnosticsTestGenerated.OnObjects.class})
 public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
     @TestMetadata("compiler/testData/diagnostics/tests")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.CyclicHierarchy.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Delegation.class, Tests.Deparenthesize.class, Tests.DuplicateJvmSignature.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.Imports.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Labels.class, Tests.Library.class, Tests.Multimodule.class, Tests.NamedArguments.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.TraitWithRequired.class, Tests.Typedefs.class, Tests.Unit.class, Tests.Varargs.class, Tests.When.class})
     public static class Tests extends AbstractJetDiagnosticsTest {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Abstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Abstract.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AbstractInAbstractClass.kt")
         public void testAbstractInAbstractClass() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AbstractInClass.kt")
         public void testAbstractInClass() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AbstractInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AbstractInTrait.kt")
         public void testAbstractInTrait() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AbstractInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AbstractInTrait.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInTests() throws Exception {
@@ -58,405 +64,486 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         
         @TestMetadata("AnonymousInitializerVarAndConstructor.kt")
         public void testAnonymousInitializerVarAndConstructor() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AnonymousInitializers.kt")
         public void testAnonymousInitializers() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AnonymousInitializers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AnonymousInitializers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCreatedIt.kt")
         public void testAutoCreatedIt() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AutoCreatedIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AutoCreatedIt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutocastAmbiguitites.kt")
         public void testAutocastAmbiguitites() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AutocastAmbiguitites.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutocastsForStableIdentifiers.kt")
         public void testAutocastsForStableIdentifiers() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/AutocastsForStableIdentifiers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Basic.kt")
         public void testBasic() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Basic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Basic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryCallsOnNullableValues.kt")
         public void testBinaryCallsOnNullableValues() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Bounds.kt")
         public void testBounds() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Bounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Bounds.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BreakContinue.kt")
         public void testBreakContinue() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/BreakContinue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/BreakContinue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Builders.kt")
         public void testBuilders() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Builders.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Builders.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Casts.kt")
         public void testCasts() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CharacterLiterals.kt")
         public void testCharacterLiterals() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/CharacterLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CharacterLiterals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("checkType.kt")
         public void testCheckType() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/checkType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CompareToWithErrorType.kt")
         public void testCompareToWithErrorType() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CompareToWithErrorType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constants.kt")
         public void testConstants() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Constants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constructors.kt")
         public void testConstructors() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Constructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Constructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorsOfPrimitives.kt")
         public void testConstructorsOfPrimitives() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CovariantOverrideType.kt")
         public void testCovariantOverrideType() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/CovariantOverrideType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/CovariantOverrideType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultValuesTypechecking.kt")
         public void testDefaultValuesTypechecking() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DeferredTypes.kt")
         public void testDeferredTypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/DeferredTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DeferredTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DiamondFunction.kt")
         public void testDiamondFunction() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/DiamondFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DiamondFunctionGeneric.kt")
         public void testDiamondFunctionGeneric() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/DiamondFunctionGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondFunctionGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DiamondProperty.kt")
         public void testDiamondProperty() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/DiamondProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/DiamondProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Dollar.kt")
         public void testDollar() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Dollar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Dollar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FinalClassObjectBound.kt")
         public void testFinalClassObjectBound() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/FinalClassObjectBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FinalClassObjectBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ForRangeConventions.kt")
         public void testForRangeConventions() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ForRangeConventions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ForRangeConventions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionCalleeExpressions.kt")
         public void testFunctionCalleeExpressions() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionReturnTypes.kt")
         public void testFunctionReturnTypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/FunctionReturnTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/FunctionReturnTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericArgumentConsistency.kt")
         public void testGenericArgumentConsistency() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericArgumentConsistency.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericFunctionIsLessSpecific.kt")
         public void testGenericFunctionIsLessSpecific() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IllegalModifiers.kt")
         public void testIllegalModifiers() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/IllegalModifiers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IllegalModifiers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IncDec.kt")
         public void testIncDec() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/IncDec.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncDec.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IncorrectCharacterLiterals.kt")
         public void testIncorrectCharacterLiterals() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InferNullabilityInThenBlock.kt")
         public void testInferNullabilityInThenBlock() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IsExpressions.kt")
         public void testIsExpressions() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/IsExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt310.kt")
         public void testKt310() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/kt310.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt310.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt53.kt")
         public void testKt53() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/kt53.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/kt53.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LValueAssignment.kt")
         public void testLValueAssignment() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/LValueAssignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/LValueAssignment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MergePackagesWithJava.kt")
         public void testMergePackagesWithJava() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/MergePackagesWithJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MergePackagesWithJava.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MultilineStringTemplates.kt")
         public void testMultilineStringTemplates() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/MultilineStringTemplates.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultilineStringTemplates.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MultipleBounds.kt")
         public void testMultipleBounds() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/MultipleBounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/MultipleBounds.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Nullability.kt")
         public void testNullability() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideFunctionWithParamDefaultValue.kt")
         public void testOverrideFunctionWithParamDefaultValue() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverridenFunctionAndSpecifiedTypeParameter.kt")
         public void testOverridenFunctionAndSpecifiedTypeParameter() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverridingVarByVal.kt")
         public void testOverridingVarByVal() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/OverridingVarByVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/OverridingVarByVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PackageAsExpression.kt")
         public void testPackageAsExpression() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/PackageAsExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageAsExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PackageInExpressionPosition.kt")
         public void testPackageInExpressionPosition() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageInExpressionPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PackageQualified.kt")
         public void testPackageQualified() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/PackageQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PackageQualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrimaryConstructors.kt")
         public void testPrimaryConstructors() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/PrimaryConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PrimaryConstructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ProcessingEmptyImport.kt")
         public void testProcessingEmptyImport() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ProcessingEmptyImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProcessingEmptyImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ProjectionOnFunctionArgumentErrror.kt")
         public void testProjectionOnFunctionArgumentErrror() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ProjectionsInSupertypes.kt")
         public void testProjectionsInSupertypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ProjectionsInSupertypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ProjectionsInSupertypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Properties.kt")
         public void testProperties() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Properties.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Properties.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyInitializers.kt")
         public void testPropertyInitializers() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/PropertyInitializers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/PropertyInitializers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedExpressions.kt")
         public void testQualifiedExpressions() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/QualifiedExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/QualifiedExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RecursiveTypeInference.kt")
         public void testRecursiveTypeInference() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/RecursiveTypeInference.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/RecursiveTypeInference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ReflectionTypesNotLoaded.kt")
         public void testReflectionTypesNotLoaded() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ResolveOfJavaGenerics.kt")
         public void testResolveOfJavaGenerics() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ResolveToJava.kt")
         public void testResolveToJava() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ResolveToJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ResolveToJava.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Return.kt")
         public void testReturn() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Return.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Return.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SafeCallNonNullReceiver.kt")
         public void testSafeCallNonNullReceiver() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SafeCallNonNullReceiverReturnNull.kt")
         public void testSafeCallNonNullReceiverReturnNull() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SafeCallOnFakePackage.kt")
         public void testSafeCallOnFakePackage() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SafeCallOnFakePackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ShiftFunctionTypes.kt")
         public void testShiftFunctionTypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ShiftFunctionTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StarsInFunctionCalls.kt")
         public void testStarsInFunctionCalls() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringTemplates.kt")
         public void testStringTemplates() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/StringTemplates.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/StringTemplates.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SupertypeListChecks.kt")
         public void testSupertypeListChecks() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SupertypeListChecks.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SupertypeListChecks.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SyntaxErrorInTestHighlighting.kt")
         public void testSyntaxErrorInTestHighlighting() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SyntaxErrorInTestHighlightingEof.kt")
         public void testSyntaxErrorInTestHighlightingEof() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitOverrideObjectMethods.kt")
         public void testTraitOverrideObjectMethods() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TypeInference.kt")
         public void testTypeInference() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/TypeInference.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeInference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TypeMismatchOnOverrideWithSyntaxErrors.kt")
         public void testTypeMismatchOnOverrideWithSyntaxErrors() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitByDefaultForFunctionTypes.kt")
         public void testUnitByDefaultForFunctionTypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitValue.kt")
         public void testUnitValue() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/UnitValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnitValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Unresolved.kt")
         public void testUnresolved() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Unresolved.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Unresolved.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnusedVariables.kt")
         public void testUnusedVariables() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/UnusedVariables.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/UnusedVariables.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ValAndFunOverrideCompatibilityClash.kt")
         public void testValAndFunOverrideCompatibilityClash() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarargTypes.kt")
         public void testVarargTypes() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/VarargTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/VarargTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Varargs.kt")
         public void testVarargs() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Varargs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Varargs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Variance.kt")
         public void testVariance() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/Variance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/Variance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/annotations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Annotations.AnnotationParameterMustBeConstant.class})
         public static class Annotations extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInAnnotations() throws Exception {
@@ -465,125 +552,150 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AmbigiousAnnotationConstructor.kt")
             public void testAmbigiousAnnotationConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotatedConstructorParams.kt")
             public void testAnnotatedConstructorParams() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotationForClassTypeParameter.kt")
             public void testAnnotationForClassTypeParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotationForFunctionTypeParameter.kt")
             public void testAnnotationForFunctionTypeParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotationForObject.kt")
             public void testAnnotationForObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationForObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("annotationInheritance.kt")
             public void testAnnotationInheritance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/annotationInheritance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationInheritance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("annotationModifier.kt")
             public void testAnnotationModifier() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/annotationModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationModifier.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotationsForClasses.kt")
             public void testAnnotationsForClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotationsForPropertyTypeParameter.kt")
             public void testAnnotationsForPropertyTypeParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BasicAnnotations.kt")
             public void testBasicAnnotations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/BasicAnnotations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/BasicAnnotations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorCall.kt")
             public void testConstructorCall() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/ConstructorCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Deprecated.kt")
             public void testDeprecated() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/Deprecated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/Deprecated.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invalidTypesInAnnotationConstructor.kt")
             public void testInvalidTypesInAnnotationConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaAnnotationConstructors.kt")
             public void testJavaAnnotationConstructors() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1860-negative.kt")
             public void testKt1860_negative() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1860-positive.kt")
             public void testKt1860_positive() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1886annotationBody.kt")
             public void testKt1886annotationBody() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingValOnParameter.kt")
             public void testMissingValOnParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/missingValOnParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/missingValOnParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NonAnnotationClass.kt")
             public void testNonAnnotationClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("onExpression.kt")
             public void testOnExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/onExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("onInitializer.kt")
             public void testOnInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/onInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("onLoops.kt")
             public void testOnLoops() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/onLoops.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoops.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("onLoopsUnreachable.kt")
             public void testOnLoopsUnreachable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("onMultiDeclaration.kt")
             public void testOnMultiDeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant")
+            @TestDataPath("$PROJECT_ROOT")
             public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -591,32 +703,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("booleanLocalVal.kt")
                 public void testBooleanLocalVal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compareAndEquals.kt")
                 public void testCompareAndEquals() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enumConst.kt")
                 public void testEnumConst() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("javaProperties.kt")
                 public void testJavaProperties() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kotlinProperties.kt")
                 public void testKotlinProperties() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("strings.kt")
                 public void testStrings() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -630,6 +748,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/backingField")
+        @TestDataPath("$PROJECT_ROOT")
         public static class BackingField extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInBackingField() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -637,112 +756,134 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("CustomGetSet.kt")
             public void testCustomGetSet() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CustomGetVal.kt")
             public void testCustomGetVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CustomGetValGlobal.kt")
             public void testCustomGetValGlobal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CustomGetVar.kt")
             public void testCustomGetVar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CustomGetVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CustomSet.kt")
             public void testCustomSet() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CustomSet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomSet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CyclicReferenceInitializer.kt")
             public void testCyclicReferenceInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt462BackingFieldsResolve.kt")
             public void testKt462BackingFieldsResolve() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt782packageLevel.kt")
             public void testKt782packageLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("qualifiedWithThis.kt")
             public void testQualifiedWithThis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadForwardInAnonymous.kt")
             public void testReadForwardInAnonymous() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadForwardInPropertyInitializer.kt")
             public void testReadForwardInPropertyInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadInAnonymous.kt")
             public void testReadInAnonymous() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadInAnotherPropertyIntializer.kt")
             public void testReadInAnotherPropertyIntializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadInFunction.kt")
             public void testReadInFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentAbstractPropertyInAnonymous.kt")
             public void testReadNonexistentAbstractPropertyInAnonymous() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentAbstractPropertyInFunction.kt")
             public void testReadNonexistentAbstractPropertyInFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentCustomGetInAnonymous.kt")
             public void testReadNonexistentCustomGetInAnonymous() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentCustomGetInAnotherInitializer.kt")
             public void testReadNonexistentCustomGetInAnotherInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentDeclaredInHigher.kt")
             public void testReadNonexistentDeclaredInHigher() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReadNonexistentPropertyInAnonymous.kt")
             public void testReadNonexistentPropertyInAnonymous() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WriteNonexistentDeclaredInHigher.kt")
             public void testWriteNonexistentDeclaredInHigher() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/cast")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Cast.Bare.class, Cast.NeverSucceeds.class})
         public static class Cast extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInCast() throws Exception {
@@ -751,225 +892,270 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AsErasedError.kt")
             public void testAsErasedError() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/AsErasedError.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedError.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AsErasedFine.kt")
             public void testAsErasedFine() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/AsErasedFine.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedFine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AsErasedStar.kt")
             public void testAsErasedStar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/AsErasedStar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedStar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AsErasedWarning.kt")
             public void testAsErasedWarning() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/AsErasedWarning.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constants.kt")
             public void testConstants() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/constants.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/constants.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DowncastMap.kt")
             public void testDowncastMap() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/DowncastMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/DowncastMap.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsArray.kt")
             public void testIsArray() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt")
             public void testIsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForExactSupertypeCheck.kt")
             public void testIsErasedAllowForExactSupertypeCheck() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForOverridenVarianceWithProjection.kt")
             public void testIsErasedAllowForOverridenVarianceWithProjection() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForSupertypeCheckWithContrvariance.kt")
             public void testIsErasedAllowForSupertypeCheckWithContrvariance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForSupertypeCheckWithCovariance.kt")
             public void testIsErasedAllowForSupertypeCheckWithCovariance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForTypeWithIrrelevantMixin.kt")
             public void testIsErasedAllowForTypeWithIrrelevantMixin() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt")
             public void testIsErasedAllowForTypeWithTwoSameTypeSubstitutions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowForTypeWithoutTypeArguments.kt")
             public void testIsErasedAllowForTypeWithoutTypeArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowFromOut.kt")
             public void testIsErasedAllowFromOut() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowFromOut2.kt")
             public void testIsErasedAllowFromOut2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowFromOutAtClass.kt")
             public void testIsErasedAllowFromOutAtClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowParameterSubtype.kt")
             public void testIsErasedAllowParameterSubtype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowSameClassParameter.kt")
             public void testIsErasedAllowSameClassParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedAllowSameParameterParameter.kt")
             public void testIsErasedAllowSameParameterParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("isErasedAnyAndStarred.kt")
             public void testIsErasedAnyAndStarred() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowDifferentArgInvariantPosition.kt")
             public void testIsErasedDisallowDifferentArgInvariantPosition() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowForOverridenVariance.kt")
             public void testIsErasedDisallowForOverridenVariance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowForTypeWithConstraints.kt")
             public void testIsErasedDisallowForTypeWithConstraints() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowFromAny.kt")
             public void testIsErasedDisallowFromAny() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowFromIn.kt")
             public void testIsErasedDisallowFromIn() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowFromOut.kt")
             public void testIsErasedDisallowFromOut() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDisallowFromOutAtClass.kt")
             public void testIsErasedDisallowFromOutAtClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt")
             public void testIsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt")
             public void testIsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedNonGeneric.kt")
             public void testIsErasedNonGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedNullableTasT.kt")
             public void testIsErasedNullableTasT() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedStar.kt")
             public void testIsErasedStar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedStar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedStar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("isErasedTAndStarred.kt")
             public void testIsErasedTAndStarred() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedTasT.kt")
             public void testIsErasedTasT() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedTasT.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedTasT.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsErasedToErrorType.kt")
             public void testIsErasedToErrorType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("isErasedUnrelatedAndStarred.kt")
             public void testIsErasedUnrelatedAndStarred() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsRecursionSustainable.kt")
             public void testIsRecursionSustainable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsReified.kt")
             public void testIsReified() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsReified.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsReified.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsTraits.kt")
             public void testIsTraits() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/IsTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/IsTraits.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt614.kt")
             public void testKt614() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/kt614.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/kt614.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenErasedDisallowFromAny.kt")
             public void testWhenErasedDisallowFromAny() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenWithExpression.kt")
             public void testWhenWithExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/WhenWithExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/cast/bare")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Bare extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInBare() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/bare"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -977,102 +1163,122 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("AsNestedBare.kt")
                 public void testAsNestedBare() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("AsNullable.kt")
                 public void testAsNullable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/AsNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("AsNullableNotEnough.kt")
                 public void testAsNullableNotEnough() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EitherAs.kt")
                 public void testEitherAs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/EitherAs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherAs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EitherIs.kt")
                 public void testEitherIs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/EitherIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherIs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EitherNotIs.kt")
                 public void testEitherNotIs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EitherSafeAs.kt")
                 public void testEitherSafeAs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EitherWhen.kt")
                 public void testEitherWhen() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/EitherWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/EitherWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ErrorsInSubstitution.kt")
                 public void testErrorsInSubstitution() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FromErrorType.kt")
                 public void testFromErrorType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/FromErrorType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/FromErrorType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NullableAs.kt")
                 public void testNullableAs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/NullableAs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NullableAsNotEnough.kt")
                 public void testNullableAsNotEnough() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NullableAsNullable.kt")
                 public void testNullableAsNullable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NullableAsNullableNotEnough.kt")
                 public void testNullableAsNullableNotEnough() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("RedundantNullable.kt")
                 public void testRedundantNullable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ToErrorType.kt")
                 public void testToErrorType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/ToErrorType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/ToErrorType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("UnrelatedAs.kt")
                 public void testUnrelatedAs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("UnrelatedColon.kt")
                 public void testUnrelatedColon() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("UnrelatedIs.kt")
                 public void testUnrelatedIs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NeverSucceeds extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInNeverSucceeds() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/neverSucceeds"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1080,22 +1286,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("MappedDirect.kt")
                 public void testMappedDirect() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MappedSubtypes.kt")
                 public void testMappedSubtypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NoGenericsRelated.kt")
                 public void testNoGenericsRelated() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NoGenericsUnrelated.kt")
                 public void testNoGenericsUnrelated() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1110,6 +1320,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/checkArguments")
+        @TestDataPath("$PROJECT_ROOT")
         public static class CheckArguments extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInCheckArguments() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/checkArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1117,27 +1328,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("booleanExpressions.kt")
             public void testBooleanExpressions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1897_diagnostic_part.kt")
             public void testKt1897_diagnostic_part() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1940.kt")
             public void testKt1940() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/checkArguments/kt1940.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/kt1940.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SpreadVarargs.kt")
             public void testSpreadVarargs() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/classObjects")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassObjects extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInClassObjects() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1145,52 +1361,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ClassObjectCannotAccessClassFields.kt")
             public void testClassObjectCannotAccessClassFields() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObjectInLocalClass.kt")
             public void testClassObjectInLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectVisibility.kt")
             public void testClassObjectVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjects.kt")
             public void testClassObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/ClassObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("importClassInClassObject.kt")
             public void testImportClassInClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerClassClassObject.kt")
             public void testInnerClassClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invisibleClassObjects.kt")
             public void testInvisibleClassObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3866.kt")
             public void testKt3866() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/kt3866.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/kt3866.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClassInPrivateClassObject.kt")
             public void testNestedClassInPrivateClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ControlFlowAnalysis.DeadCode.class, ControlFlowAnalysis.DefiniteReturn.class})
         public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInControlFlowAnalysis() throws Exception {
@@ -1199,215 +1425,258 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("backingFieldInsideGetter.kt")
             public void testBackingFieldInsideGetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("breakOrContinueInLoopCondition.kt")
             public void testBreakOrContinueInLoopCondition() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("checkInnerLocalDeclarations.kt")
             public void testCheckInnerLocalDeclarations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("checkPropertyAccessor.kt")
             public void testCheckPropertyAccessor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("definiteReturnInWhen.kt")
             public void testDefiniteReturnInWhen() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1001.kt")
             public void testKt1001() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1027.kt")
             public void testKt1027() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1066.kt")
             public void testKt1066() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1156.kt")
             public void testKt1156() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1185enums.kt")
             public void testKt1185enums() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1189.kt")
             public void testKt1189() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1191.kt")
             public void testKt1191() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1219.1301.kt")
             public void testKt1219_1301() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1571.kt")
             public void testKt1571() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1977.kt")
             public void testKt1977() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2166_kt2103.kt")
             public void testKt2166_kt2103() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2226.kt")
             public void testKt2226() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2330.kt")
             public void testKt2330() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2334.kt")
             public void testKt2334() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2369.kt")
             public void testKt2369() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2845.kt")
             public void testKt2845() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2960.kt")
             public void testKt2960() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2972.kt")
             public void testKt2972() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3444.kt")
             public void testKt3444() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3501.kt")
             public void testKt3501() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4405.kt")
             public void testKt4405() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt510.kt")
             public void testKt510() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt607.kt")
             public void testKt607() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt609.kt")
             public void testKt609() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt610.kt")
             public void testKt610() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt776.kt")
             public void testKt776() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt843.kt")
             public void testKt843() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt897.kt")
             public void testKt897() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClasses.kt")
             public void testLocalClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertiesOrderInPackage.kt")
             public void testPropertiesOrderInPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("referenceToPropertyInitializer.kt")
             public void testReferenceToPropertyInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("repeatUnitializedErrorOnlyForLocalVars.kt")
             public void testRepeatUnitializedErrorOnlyForLocalVars() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("scopeOfAnonymousInitializer.kt")
             public void testScopeOfAnonymousInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninitializedInLocalDeclarations.kt")
             public void testUninitializedInLocalDeclarations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UninitializedOrReassignedVariables.kt")
             public void testUninitializedOrReassignedVariables() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedArgs.kt")
             public void testUnmappedArgs() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varInitializationInIfInCycle.kt")
             public void testVarInitializationInIfInCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DeadCode extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDeadCode() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1415,127 +1684,152 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("commasAndWhitespaces.kt")
                 public void testCommasAndWhitespaces() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("commentsInDeadCode.kt")
                 public void testCommentsInDeadCode() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCallInInvokeCall.kt")
                 public void testDeadCallInInvokeCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCallInReceiver.kt")
                 public void testDeadCallInReceiver() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeDifferentExamples.kt")
                 public void testDeadCodeDifferentExamples() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeFromDifferentSources.kt")
                 public void testDeadCodeFromDifferentSources() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInArrayAccess.kt")
                 public void testDeadCodeInArrayAccess() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInAssignment.kt")
                 public void testDeadCodeInAssignment() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInBinaryExpressions.kt")
                 public void testDeadCodeInBinaryExpressions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInCalls.kt")
                 public void testDeadCodeInCalls() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInDeadCode.kt")
                 public void testDeadCodeInDeadCode() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInIf.kt")
                 public void testDeadCodeInIf() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInInnerExpressions.kt")
                 public void testDeadCodeInInnerExpressions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInLocalDeclarations.kt")
                 public void testDeadCodeInLocalDeclarations() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInLoops.kt")
                 public void testDeadCodeInLoops() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInReturn.kt")
                 public void testDeadCodeInReturn() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInUnaryExpr.kt")
                 public void testDeadCodeInUnaryExpr() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("deadCodeInWhileFromBreak.kt")
                 public void testDeadCodeInWhileFromBreak() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("expressionInUnitLiteral.kt")
                 public void testExpressionInUnitLiteral() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2585_1.kt")
                 public void testKt2585_1() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2585_2.kt")
                 public void testKt2585_2() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2585_3.kt")
                 public void testKt2585_3() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3162tryAsInitializer.kt")
                 public void testKt3162tryAsInitializer() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt5200DeadCodeInLambdas.kt")
                 public void testKt5200DeadCodeInLambdas() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DefiniteReturn extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDefiniteReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1543,17 +1837,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("kt3444_ReturnFromLocalFunctions.kt")
                 public void testKt3444_ReturnFromLocalFunctions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4034.kt")
                 public void testKt4034() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnFromFunctionInObject.kt")
                 public void testReturnFromFunctionInObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1568,6 +1865,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/controlStructures")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ControlStructures extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInControlStructures() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1575,87 +1873,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("emptyIf.kt")
             public void testEmptyIf() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/emptyIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/emptyIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("forLoopWithNullableRange.kt")
             public void testForLoopWithNullableRange() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("forWithNullableIterator.kt")
             public void testForWithNullableIterator() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ForWithoutBraces.kt")
             public void testForWithoutBraces() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ForbidStatementAsDirectFunctionBody.kt")
             public void testForbidStatementAsDirectFunctionBody() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jumpAcrossFunctionBoundary.kt")
             public void testJumpAcrossFunctionBoundary() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1075.kt")
             public void testKt1075() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt1075.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt1075.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4310.kt")
             public void testKt4310() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt4310.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt4310.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt657.kt")
             public void testKt657() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt657.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt657.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt770.kt351.kt735_StatementType.kt")
             public void testKt770_kt351_kt735_StatementType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt786.kt")
             public void testKt786() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt786.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt786.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt799.kt")
             public void testKt799() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/kt799.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/kt799.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryReturnType.kt")
             public void testTryReturnType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valVarCatchParameter.kt")
             public void testValVarCatchParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valVarLoopParameter.kt")
             public void testValVarLoopParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("when.kt234.kt973.kt")
             public void testWhen_kt234_kt973() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy")
+        @TestDataPath("$PROJECT_ROOT")
         public static class CyclicHierarchy extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInCyclicHierarchy() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cyclicHierarchy"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1663,52 +1978,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("classIndirectlyInheritsNested.kt")
             public void testClassIndirectlyInheritsNested() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classInheritsNested.kt")
             public void testClassInheritsNested() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cyclicHierarchy.kt")
             public void testCyclicHierarchy() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaKotlinJavaCycle.kt")
             public void testJavaKotlinJavaCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinJavaCycle.kt")
             public void testKotlinJavaCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinJavaKotlinCycle.kt")
             public void testKotlinJavaKotlinCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinJavaNestedCycle.kt")
             public void testKotlinJavaNestedCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt303.kt")
             public void testKt303() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("twoClassesWithNestedCycle.kt")
             public void testTwoClassesWithNestedCycle() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/dataClasses")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DataClasses extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDataClasses() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1716,117 +2041,140 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("bothParamsAreNotProperties.kt")
             public void testBothParamsAreNotProperties() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentFunctionInSubClass.kt")
             public void testComponentFunctionInSubClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentFunctionVisibility.kt")
             public void testComponentFunctionVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentFunctionsAreFinal.kt")
             public void testComponentFunctionsAreFinal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentNamedComponent1.kt")
             public void testComponentNamedComponent1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conflictingCopyOverloads.kt")
             public void testConflictingCopyOverloads() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conflictingOverloads.kt")
             public void testConflictingOverloads() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dataClassOverrideConflict.kt")
             public void testDataClassOverrideConflict() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyConstructor.kt")
             public void testEmptyConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("firstParamIsVal.kt")
             public void testFirstParamIsVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("firstParamIsVar.kt")
             public void testFirstParamIsVar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("implementTraitWhichHasComponent1.kt")
             public void testImplementTraitWhichHasComponent1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("implementTraitWhichHasFinalComponent1.kt")
             public void testImplementTraitWhichHasFinalComponent1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multiDeclaration.kt")
             public void testMultiDeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multiDeclarationFor.kt")
             public void testMultiDeclarationFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notADataClass.kt")
             public void testNotADataClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/notADataClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/notADataClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("oneValParam.kt")
             public void testOneValParam() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/oneValParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/oneValParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("overrideInvisibleMember.kt")
             public void testOverrideInvisibleMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("secondParamIsVal.kt")
             public void testSecondParamIsVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("secondParamIsVar.kt")
             public void testSecondParamIsVar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("twoValParams.kt")
             public void testTwoValParams() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/twoValParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoValParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("twoVarParams.kt")
             public void testTwoVarParams() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataClasses/twoVarParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataClasses/twoVarParams.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/dataFlow")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({DataFlow.Local.class})
         public static class DataFlow extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDataFlow() throws Exception {
@@ -1835,25 +2183,30 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("CalleeExpression.kt")
             public void testCalleeExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EmptyIf.kt")
             public void testEmptyIf() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlow/EmptyIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/EmptyIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsExpression.kt")
             public void testIsExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/IsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenSubject.kt")
             public void testWhenSubject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlow/WhenSubject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/WhenSubject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/dataFlow/local")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Local extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInLocal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1861,62 +2214,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("kt2835.kt")
                 public void testKt2835() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/kt2835.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassBase.kt")
                 public void testLocalClassBase() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassDefaultParameters.kt")
                 public void testLocalClassDefaultParameters() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassDelegatedProperties.kt")
                 public void testLocalClassDelegatedProperties() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassDelegation.kt")
                 public void testLocalClassDelegation() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassFunctions.kt")
                 public void testLocalClassFunctions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassInMemberOfLocalClass.kt")
                 public void testLocalClassInMemberOfLocalClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassInitializer.kt")
                 public void testLocalClassInitializer() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalClassProperty.kt")
                 public void testLocalClassProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalObject.kt")
                 public void testLocalObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalObjectDelegation.kt")
                 public void testLocalObjectDelegation() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NestedLocalClass.kt")
                 public void testNestedLocalClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1930,6 +2295,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1937,267 +2303,320 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AndOr.kt")
             public void testAndOr() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayAccess.kt")
             public void testArrayAccess() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayExpression.kt")
             public void testArrayExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayGetSetConvention.kt")
             public void testArrayGetSetConvention() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayIndices.kt")
             public void testArrayIndices() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Assignment.kt")
             public void testAssignment() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AssignmentInInitializer.kt")
             public void testAssignmentInInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AssignmentOperation.kt")
             public void testAssignmentOperation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AssignmentToArrayElement.kt")
             public void testAssignmentToArrayElement() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpression.kt")
             public void testBinaryExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionBooleanOperations.kt")
             public void testBinaryExpressionBooleanOperations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionCompareToConvention.kt")
             public void testBinaryExpressionCompareToConvention() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionContainsConvention.kt")
             public void testBinaryExpressionContainsConvention() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionElvis.kt")
             public void testBinaryExpressionElvis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionEqualsConvention.kt")
             public void testBinaryExpressionEqualsConvention() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionIdentifier.kt")
             public void testBinaryExpressionIdentifier() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("BinaryExpressionPlusConvention.kt")
             public void testBinaryExpressionPlusConvention() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Condition.kt")
             public void testCondition() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ContinueOuterLoop.kt")
             public void testContinueOuterLoop() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DeepIf.kt")
             public void testDeepIf() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DoWhile.kt")
             public void testDoWhile() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DoWhileCondition.kt")
             public void testDoWhileCondition() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Elvis.kt")
             public void testElvis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExclExcl.kt")
             public void testExclExcl() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("For.kt")
             public void testFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ForLoopRange.kt")
             public void testForLoopRange() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunctionLiteral.kt")
             public void testFunctionLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IfStatement.kt")
             public void testIfStatement() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IfThenElse.kt")
             public void testIfThenElse() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IfThenElseBothInvalid.kt")
             public void testIfThenElseBothInvalid() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IsExpression.kt")
             public void testIsExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4332WhenBranches.kt")
             public void testKt4332WhenBranches() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt5155WhenBranches.kt")
             public void testKt5155WhenBranches() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt5182WhenBranches.kt")
             public void testKt5182WhenBranches() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ManyIfs.kt")
             public void testManyIfs() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclaration.kt")
             public void testMultiDeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectExpression.kt")
             public void testObjectExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("QualifiedExpression.kt")
             public void testQualifiedExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Return.kt")
             public void testReturn() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("StringTemplate.kt")
             public void testStringTemplate() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ThisSuper.kt")
             public void testThisSuper() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Throw.kt")
             public void testThrow() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TryCatch.kt")
             public void testTryCatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TryFinally.kt")
             public void testTryFinally() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UnaryExpression.kt")
             public void testUnaryExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("When.kt")
             public void testWhen() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenEntryAs.kt")
             public void testWhenEntryAs() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenEntryIs.kt")
             public void testWhenEntryIs() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenIn.kt")
             public void testWhenIn() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhenSubject.kt")
             public void testWhenSubject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("While.kt")
             public void testWhile() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WhileCondition.kt")
             public void testWhileCondition() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({DeclarationChecks.MultiDeclarations.class})
         public static class DeclarationChecks extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDeclarationChecks() throws Exception {
@@ -2206,120 +2625,144 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ambiguousObjectExpressionType.kt")
             public void testAmbiguousObjectExpressionType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ComponentFunctionReturnTypeMismatch.kt")
             public void testComponentFunctionReturnTypeMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingAndRedundantProjections.kt")
             public void testConflictingAndRedundantProjections() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DataFlowInMultiDeclInFor.kt")
             public void testDataFlowInMultiDeclInFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DataFlowInfoInMultiDecl.kt")
             public void testDataFlowInfoInMultiDecl() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1141.kt")
             public void testKt1141() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt1141.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1141.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1193.kt")
             public void testKt1193() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt1193.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2096.kt")
             public void testKt2096() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2096.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2096.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2142.kt")
             public void testKt2142() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2142.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2142.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2397.kt")
             public void testKt2397() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2631_MultipleDeclaration.kt")
             public void testKt2631_MultipleDeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2643MultiDeclInControlFlow.kt")
             public void testKt2643MultiDeclInControlFlow() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt559.kt")
             public void testKt559() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/kt559.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/kt559.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localDeclarationModifiers.kt")
             public void testLocalDeclarationModifiers() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionNoInheritVisibility.kt")
             public void testLocalFunctionNoInheritVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LocalVariableWithNoTypeInformation.kt")
             public void testLocalVariableWithNoTypeInformation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclarationErrors.kt")
             public void testMultiDeclarationErrors() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("packageDeclarationModifiers.kt")
             public void testPackageDeclarationModifiers() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyInPackageHasNoInheritVisibility.kt")
             public void testPropertyInPackageHasNoInheritVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RedeclarationsInMultiDecl.kt")
             public void testRedeclarationsInMultiDecl() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unambiguousObjectExpressionType.kt")
             public void testUnambiguousObjectExpressionType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valVarFunctionParameter.kt")
             public void testValVarFunctionParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VarianceOnFunctionAndPropertyTypeParameters.kt")
             public void testVarianceOnFunctionAndPropertyTypeParameters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations")
+            @TestDataPath("$PROJECT_ROOT")
             public static class MultiDeclarations extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInMultiDeclarations() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2327,47 +2770,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("DoubleDeclForLoop.kt")
                 public void testDoubleDeclForLoop() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FolLoopTypeComponentTypeMismatch.kt")
                 public void testFolLoopTypeComponentTypeMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ForLoopComponentFunctionAmbiguity.kt")
                 public void testForLoopComponentFunctionAmbiguity() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ForLoopComponentFunctionMissing.kt")
                 public void testForLoopComponentFunctionMissing() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ForLoopWithExtensions.kt")
                 public void testForLoopWithExtensions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ForWithExplicitTypes.kt")
                 public void testForWithExplicitTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2829.kt")
                 public void testKt2829() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("RedeclarationInForLoop.kt")
                 public void testRedeclarationInForLoop() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("SingleDeclForLoop.kt")
                 public void testSingleDeclForLoop() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2381,21 +2833,25 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({DelegatedProperty.Inference.class})
         public static class DelegatedProperty extends AbstractJetDiagnosticsTest {
             @TestMetadata("absentErrorAboutInitializer.kt")
             public void testAbsentErrorAboutInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("absentErrorAboutType.kt")
             public void testAbsentErrorAboutType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("abstractDelegatedProperty.kt")
             public void testAbstractDelegatedProperty() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInDelegatedProperty() throws Exception {
@@ -2404,155 +2860,186 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("backingField.kt")
             public void testBackingField() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegatedPropertyOverridedInTrait.kt")
             public void testDelegatedPropertyOverridedInTrait() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegatedPropertyOverridedInTraitTypeMismatch.kt")
             public void testDelegatedPropertyOverridedInTraitTypeMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericGetter.kt")
             public void testGenericGetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getterWithSubtype.kt")
             public void testGetterWithSubtype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inTrait.kt")
             public void testInTrait() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/inTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incompleteTypeInference.kt")
             public void testIncompleteTypeInference() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4640.kt")
             public void testKt4640() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/kt4640.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/kt4640.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVariable.kt")
             public void testLocalVariable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/localVariable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/localVariable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missedGetter.kt")
             public void testMissedGetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missedSetter.kt")
             public void testMissedSetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyDefferedType.kt")
             public void testPropertyDefferedType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicDelegatedProperty.kt")
             public void testPublicDelegatedProperty() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursiveType.kt")
             public void testRecursiveType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("redundantGetter.kt")
             public void testRedundantGetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("redundantSetter.kt")
             public void testRedundantSetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterThisTypeMismatch.kt")
             public void testSetterThisTypeMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterWithSupertype.kt")
             public void testSetterWithSupertype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisInDelegate.kt")
             public void testThisInDelegate() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisOfAnyType.kt")
             public void testThisOfAnyType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisOfNothingNullableType.kt")
             public void testThisOfNothingNullableType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisOfNothingType.kt")
             public void testThisOfNothingType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("twoGetMethods.kt")
             public void testTwoGetMethods() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatchForGetReturnType.kt")
             public void testTypeMismatchForGetReturnType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatchForGetWithGeneric.kt")
             public void testTypeMismatchForGetWithGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatchForSetParameter.kt")
             public void testTypeMismatchForSetParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatchForThisGetParameter.kt")
             public void testTypeMismatchForThisGetParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongCountOfParametersInGet.kt")
             public void testWrongCountOfParametersInGet() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongCountOfParametersInSet.kt")
             public void testWrongCountOfParametersInSet() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongSetterReturnType.kt")
             public void testWrongSetterReturnType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Inference extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInInference() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty/inference"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2560,47 +3047,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("differentDelegatedExpressions.kt")
                 public void testDifferentDelegatedExpressions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionGet.kt")
                 public void testExtensionGet() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionProperty.kt")
                 public void testExtensionProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("labeledDelegatedExpression.kt")
                 public void testLabeledDelegatedExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noErrorsForImplicitConstraints.kt")
                 public void testNoErrorsForImplicitConstraints() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noExpectedTypeForSupertypeConstraint.kt")
                 public void testNoExpectedTypeForSupertypeConstraint() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("useCompleterWithoutExpectedType.kt")
                 public void testUseCompleterWithoutExpectedType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("useExpectedType.kt")
                 public void testUseExpectedType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("useExpectedTypeForVal.kt")
                 public void testUseExpectedTypeForVal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2614,6 +3110,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/delegation")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Delegation extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDelegation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2621,47 +3118,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("DelegationAndOverriding.kt")
             public void testDelegationAndOverriding() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationExpectedType.kt")
             public void testDelegationExpectedType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationNotTotrait.kt")
             public void testDelegationNotTotrait() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationToJavaIface.kt")
             public void testDelegationToJavaIface() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation_ClashingFunctions.kt")
             public void testDelegation_ClashingFunctions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation_Hierarchy.kt")
             public void testDelegation_Hierarchy() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation_MultipleDelegates.kt")
             public void testDelegation_MultipleDelegates() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation_ScopeInitializationOrder.kt")
             public void testDelegation_ScopeInitializationOrder() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/deparenthesize")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Deparenthesize extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDeparenthesize() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2669,17 +3175,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ArrayAccessAssignment.kt")
             public void testArrayAccessAssignment() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("checkDeparenthesizedType.kt")
             public void testCheckDeparenthesizedType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({DuplicateJvmSignature.AccidentalOverrides.class, DuplicateJvmSignature.Bridges.class, DuplicateJvmSignature.Erasure.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.SpecialNames.class, DuplicateJvmSignature.TraitImpl.class})
         public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
@@ -2688,20 +3197,24 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("caseInProperties.kt")
             public void testCaseInProperties() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingNames.kt")
             public void testMissingNames() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("vararg.kt")
             public void testVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides")
+            @TestDataPath("$PROJECT_ROOT")
             public static class AccidentalOverrides extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInAccidentalOverrides() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2709,87 +3222,104 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("classFunctionOverriddenByProperty.kt")
                 public void testClassFunctionOverriddenByProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classFunctionOverriddenByPropertyInConstructor.kt")
                 public void testClassFunctionOverriddenByPropertyInConstructor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classFunctionOverriddenByPropertyNoGetter.kt")
                 public void testClassFunctionOverriddenByPropertyNoGetter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classPropertyOverriddenByFunction.kt")
                 public void testClassPropertyOverriddenByFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedFunctionOverriddenByProperty.kt")
                 public void testDelegatedFunctionOverriddenByProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("genericClassFunction.kt")
                 public void testGenericClassFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("overridesNothing.kt")
                 public void testOverridesNothing() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("phantomClashWithSamAdapter.kt")
                 public void testPhantomClashWithSamAdapter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateClassFunctionOverriddenByProperty.kt")
                 public void testPrivateClassFunctionOverriddenByProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("require.kt")
                 public void testRequire() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitFunctionOverriddenByProperty.kt")
                 public void testTraitFunctionOverriddenByProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitFunctionOverriddenByPropertyInTrait.kt")
                 public void testTraitFunctionOverriddenByPropertyInTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitFunctionOverriddenByPropertyNoImpl.kt")
                 public void testTraitFunctionOverriddenByPropertyNoImpl() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitPropertyOverriddenByFunction.kt")
                 public void testTraitPropertyOverriddenByFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitPropertyOverriddenByFunctionInTrait.kt")
                 public void testTraitPropertyOverriddenByFunctionInTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt")
                 public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Bridges extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInBridges() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2797,22 +3327,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("fakeOverrideTrait.kt")
                 public void testFakeOverrideTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Erasure extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInErasure() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2820,77 +3354,92 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("collections.kt")
                 public void testCollections() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegateToTwoTraits.kt")
                 public void testDelegateToTwoTraits() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationAndOwnMethod.kt")
                 public void testDelegationAndOwnMethod() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionProperties.kt")
                 public void testExtensionProperties() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("genericType.kt")
                 public void testGenericType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inheritFromTwoTraits.kt")
                 public void testInheritFromTwoTraits() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kotlinAndJavaCollections.kt")
                 public void testKotlinAndJavaCollections() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nullableType.kt")
                 public void testNullableType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("twoTraitsAndOwnFunction.kt")
                 public void testTwoTraitsAndOwnFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeMappedToJava.kt")
                 public void testTypeMappedToJava() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameter.kt")
                 public void testTypeParameter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameterWithBound.kt")
                 public void testTypeParameterWithBound() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameterWithTwoBounds.kt")
                 public void testTypeParameterWithTwoBounds() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeParameterWithTwoBoundsInWhere.kt")
                 public void testTypeParameterWithTwoBoundsInWhere() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty")
+            @TestDataPath("$PROJECT_ROOT")
             public static class FunctionAndProperty extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInFunctionAndProperty() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2898,102 +3447,122 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classObject.kt")
                 public void testClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classPropertyInConstructor.kt")
                 public void testClassPropertyInConstructor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionFunctionAndNormalFunction.kt")
                 public void testExtensionFunctionAndNormalFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionPropertyAndFunction.kt")
                 public void testExtensionPropertyAndFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionAndSetter.kt")
                 public void testFunctionAndSetter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionAndVar.kt")
                 public void testFunctionAndVar() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localClassInClass.kt")
                 public void testLocalClassInClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedClass.kt")
                 public void testNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("objectExpression.kt")
                 public void testObjectExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("objectExpressionInConstructor.kt")
                 public void testObjectExpressionInConstructor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateClassPropertyNoClash.kt")
                 public void testPrivateClassPropertyNoClash() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("topLevel.kt")
                 public void testTopLevel() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("topLevelDifferentFiles.kt")
                 public void testTopLevelDifferentFiles() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("topLevelGetter.kt")
                 public void testTopLevelGetter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("withErrorTypes.kt")
                 public void testWithErrorTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames")
+            @TestDataPath("$PROJECT_ROOT")
             public static class SpecialNames extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInSpecialNames() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3001,57 +3570,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("classObject.kt")
                 public void testClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classObjectCopiedField.kt")
                 public void testClassObjectCopiedField() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classObjectCopiedFieldObject.kt")
                 public void testClassObjectCopiedFieldObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("dataClassCopy.kt")
                 public void testDataClassCopy() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("defaults.kt")
                 public void testDefaults() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegationBy.kt")
                 public void testDelegationBy() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClassField.kt")
                 public void testInnerClassField() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("instance.kt")
                 public void testInstance() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("propertyMetadataCache.kt")
                 public void testPropertyMetadataCache() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl")
+            @TestDataPath("$PROJECT_ROOT")
             public static class TraitImpl extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInTraitImpl() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3059,12 +3639,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("oneTrait.kt")
                 public void testOneTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("twoTraits.kt")
                 public void testTwoTraits() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3083,16 +3665,19 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/enum")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Enum.Inner.class})
         public static class Enum extends AbstractJetDiagnosticsTest {
             @TestMetadata("AbstractEnum.kt")
             public void testAbstractEnum() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractEnum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractInEnum.kt")
             public void testAbstractInEnum() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInEnum() throws Exception {
@@ -3101,115 +3686,138 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("classObjectOfPrivateEnum.kt")
             public void testClassObjectOfPrivateEnum() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/classObjectOfPrivateEnum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dontCreatePackageTypeForEnumEntry.kt")
             public void testDontCreatePackageTypeForEnumEntry() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("entryShouldBeOfEnumType.kt")
             public void testEntryShouldBeOfEnumType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumEntryCannotHaveClassObject.kt")
             public void testEnumEntryCannotHaveClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumInheritance.kt")
             public void testEnumInheritance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumInheritance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumInheritance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumIsAssignableToBuiltInEnum.kt")
             public void testEnumIsAssignableToBuiltInEnum() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumModifier.kt")
             public void testEnumModifier() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumModifier.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumStarImport.kt")
             public void testEnumStarImport() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumStarImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumStarImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumWithEmptyName.kt")
             public void testEnumWithEmptyName() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/enumWithEmptyName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionNamedAsEnumEntry.kt")
             public void testExtensionNamedAsEnumEntry() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("importEnumFromJava.kt")
             public void testImportEnumFromJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/importEnumFromJava.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inheritFromEnumEntry.kt")
             public void testInheritFromEnumEntry() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inheritanceFromEnum.kt")
             public void testInheritanceFromEnum() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumValueOfMethod.kt")
             public void testJavaEnumValueOfMethod() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumValuesMethod.kt")
             public void testJavaEnumValuesMethod() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumWithAbstractFun.kt")
             public void testJavaEnumWithAbstractFun() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumWithFuns.kt")
             public void testJavaEnumWithFuns() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumWithNameClashing.kt")
             public void testJavaEnumWithNameClashing() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaEnumWithProperty.kt")
             public void testJavaEnumWithProperty() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2834.kt")
             public void testKt2834() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/kt2834.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/kt2834.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localEnums.kt")
             public void testLocalEnums() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/localEnums.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/localEnums.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("starImportNestedClassAndEntries.kt")
             public void testStarImportNestedClassAndEntries() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/enum/inner")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Inner extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInInner() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/inner"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3217,57 +3825,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("existingClassObject.kt")
                 public void testExistingClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/existingClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideClass.kt")
                 public void testInsideClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideClassObject.kt")
                 public void testInsideClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideEnum.kt")
                 public void testInsideEnum() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideEnumEntry.kt")
                 public void testInsideEnumEntry() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideInnerClassNotAllowed.kt")
                 public void testInsideInnerClassNotAllowed() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideObject.kt")
                 public void testInsideObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("insideTrait.kt")
                 public void testInsideTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/insideTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/insideTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("redeclarationInClassObject.kt")
                 public void testRedeclarationInClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("twoEnums.kt")
                 public void testTwoEnums() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/twoEnums.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnums.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("twoEnumsInClassObjectAndInnerClass.kt")
                 public void testTwoEnumsInClassObjectAndInnerClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3281,6 +3900,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/evaluate")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Evaluate extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInEvaluate() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/evaluate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3288,97 +3908,116 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("binaryMinusDepOnExpType.kt")
             public void testBinaryMinusDepOnExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("binaryMinusIndepWoExpType.kt")
             public void testBinaryMinusIndepWoExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("binaryMinusIndependentExpType.kt")
             public void testBinaryMinusIndependentExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("float.kt")
             public void testFloat() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/float.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/float.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("intOverflow.kt")
             public void testIntOverflow() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/intOverflow.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflow.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("intOverflowWithJavaProperties.kt")
             public void testIntOverflowWithJavaProperties() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("integer.kt")
             public void testInteger() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/integer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/integer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longOverflow.kt")
             public void testLongOverflow() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/longOverflow.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/longOverflow.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("numberBinaryOperations.kt")
             public void testNumberBinaryOperations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("numberBinaryOperationsCall.kt")
             public void testNumberBinaryOperationsCall() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("numberBinaryOperationsInfixCall.kt")
             public void testNumberBinaryOperationsInfixCall() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("otherOverflow.kt")
             public void testOtherOverflow() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/otherOverflow.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/otherOverflow.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("parentesized.kt")
             public void testParentesized() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/parentesized.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/parentesized.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("qualifiedExpressions.kt")
             public void testQualifiedExpressions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unaryMinusDepOnExpType.kt")
             public void testUnaryMinusDepOnExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unaryMinusIndepWoExpType.kt")
             public void testUnaryMinusIndepWoExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unaryMinusIndependentExpType.kt")
             public void testUnaryMinusIndependentExpType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongLongSuffix.kt")
             public void testWrongLongSuffix() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/extensions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Extensions extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInExtensions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3386,82 +4025,98 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionFunctions.kt")
             public void testExtensionFunctions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionMemberInClassObject.kt")
             public void testExtensionMemberInClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionsCalledOnSuper.kt")
             public void testExtensionsCalledOnSuper() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("GenericIterator.kt")
             public void testGenericIterator() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/GenericIterator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("GenericIterator2.kt")
             public void testGenericIterator2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/GenericIterator2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1875.kt")
             public void testKt1875() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/kt1875.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt1875.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2317.kt")
             public void testKt2317() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/kt2317.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt2317.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3470.kt")
             public void testKt3470() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/kt3470.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3470.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3563.kt")
             public void testKt3563() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/kt3563.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt3563.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt819ExtensionProperties.kt")
             public void testKt819ExtensionProperties() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noClassObjectsInJava.kt")
             public void testNoClassObjectsInJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("object.kt")
             public void testObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/object.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/object.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("throwOutCandidatesByReceiver.kt")
             public void testThrowOutCandidatesByReceiver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("throwOutCandidatesByReceiver2.kt")
             public void testThrowOutCandidatesByReceiver2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({FunctionLiterals.Return.class})
         public static class FunctionLiterals extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInFunctionLiterals() throws Exception {
@@ -3470,65 +4125,78 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("DanglingFunctionLiteral.kt")
             public void testDanglingFunctionLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExpectedParameterTypeMismatchVariance.kt")
             public void testExpectedParameterTypeMismatchVariance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExpectedParametersTypesMismatch.kt")
             public void testExpectedParametersTypesMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLIteralInBlockInIf.kt")
             public void testFunctionLIteralInBlockInIf() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralWithoutArgumentList.kt")
             public void testFunctionLiteralWithoutArgumentList() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2906.kt")
             public void testKt2906() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt2906.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4529.kt")
             public void testKt4529() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/kt4529.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LabeledFunctionLiterals.kt")
             public void testLabeledFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoDanglingFunctionLiteralForNestedCalls.kt")
             public void testNoDanglingFunctionLiteralForNestedCalls() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnNull.kt")
             public void testReturnNull() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/returnNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/returnNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unusedLiteral.kt")
             public void testUnusedLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unusedLiteralInsideUnitLiteral.kt")
             public void testUnusedLiteralInsideUnitLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals/return")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Return extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals/return"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3536,67 +4204,80 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("AutoLabels.kt")
                 public void testAutoLabels() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("AutoLabelsNonLocal.kt")
                 public void testAutoLabelsNonLocal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ForbiddenNonLocalReturnNoType.kt")
                 public void testForbiddenNonLocalReturnNoType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalAndNonLocalReturnInLambda.kt")
                 public void testLocalAndNonLocalReturnInLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnExplicitLabelNoParens.kt")
                 public void testLocalReturnExplicitLabelNoParens() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnExplicitLabelParens.kt")
                 public void testLocalReturnExplicitLabelParens() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnHasTypeNothing.kt")
                 public void testLocalReturnHasTypeNothing() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnInNestedFunction.kt")
                 public void testLocalReturnInNestedFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnInNestedLambda.kt")
                 public void testLocalReturnInNestedLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnNoCoercionToUnit.kt")
                 public void testLocalReturnNoCoercionToUnit() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnUnit.kt")
                 public void testLocalReturnUnit() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LocalReturnsWithExplicitReturnType.kt")
                 public void testLocalReturnsWithExplicitReturnType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MixedReturnsFromLambda.kt")
                 public void testMixedReturnsFromLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3610,6 +4291,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/generics")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Generics.TpAsReified.class, Generics.VarProjection.class})
         public static class Generics extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInGenerics() throws Exception {
@@ -3618,60 +4300,72 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ClassObjectBoundsAreNotSupported.kt")
             public void testClassObjectBoundsAreNotSupported() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1575-Class.kt")
             public void testKt1575_Class() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/kt1575-Class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1575-ClassObject.kt")
             public void testKt1575_ClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1575-Function.kt")
             public void testKt1575_Function() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/kt1575-Function.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/kt1575-Function.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Projections.kt")
             public void testProjections() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/Projections.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/Projections.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PseudoRawTypes.kt")
             public void testPseudoRawTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/PseudoRawTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RawTypeInIsExpression.kt")
             public void testRawTypeInIsExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RawTypeInIsPattern.kt")
             public void testRawTypeInIsPattern() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RecursiveUpperBoundCheck.kt")
             public void testRecursiveUpperBoundCheck() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RecursiveUpperBoundWithTwoArguments.kt")
             public void testRecursiveUpperBoundWithTwoArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveGenericBoundsBeforeSupertypes.kt")
             public void testResolveGenericBoundsBeforeSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified")
+            @TestDataPath("$PROJECT_ROOT")
             public static class TpAsReified extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInTpAsReified() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3679,32 +4373,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("Conventions.kt")
                 public void testConventions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("InConstructor.kt")
                 public void testInConstructor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("InFunction.kt")
                 public void testInFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("InProperty.kt")
                 public void testInProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("InType.kt")
                 public void testInType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/tpAsReified/InType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified/InType.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/generics/varProjection")
+            @TestDataPath("$PROJECT_ROOT")
             public static class VarProjection extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInVarProjection() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/varProjection"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3712,22 +4412,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("setterNotProjectedOutAssign.kt")
                 public void testSetterNotProjectedOutAssign() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("setterProjectedOutAssign.kt")
                 public void testSetterProjectedOutAssign() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("setterProjectedOutNoPlusAssign.kt")
                 public void testSetterProjectedOutNoPlusAssign() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("setterProjectedOutPlusAssignDefined.kt")
                 public void testSetterProjectedOutPlusAssignDefined() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3742,6 +4446,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/imports")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Imports extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInImports() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/imports"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3749,22 +4454,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ImportResolutionOrder.kt")
             public void testImportResolutionOrder() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportsHiddenByDefinitionInTheSameFile.kt")
             public void testImportsHiddenByDefinitionInTheSameFile() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RenameOnImport.kt")
             public void testRenameOnImport() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/imports/RenameOnImport.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class})
         public static class IncompleteCode extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInIncompleteCode() throws Exception {
@@ -3773,95 +4482,114 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("arrayBracketsRange.kt")
             public void testArrayBracketsRange() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("checkNothingIsSubtype.kt")
             public void testCheckNothingIsSubtype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("controlStructuresErrors.kt")
             public void testControlStructuresErrors() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inExpr.kt")
             public void testInExpr() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/inExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/inExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incompleteAssignment.kt")
             public void testIncompleteAssignment() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incompleteEquals.kt")
             public void testIncompleteEquals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1955.kt")
             public void testKt1955() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/kt1955.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt1955.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2014.kt")
             public void testKt2014() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt2014.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4866UnresolvedArrayAccess.kt")
             public void testKt4866UnresolvedArrayAccess() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoSenselessComparisonForErrorType.kt")
             public void testNoSenselessComparisonForErrorType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plusOnTheRight.kt")
             public void testPlusOnTheRight() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("pseudocodeTraverseNextInstructions.kt")
             public void testPseudocodeTraverseNextInstructions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("senselessComparisonWithNull.kt")
             public void testSenselessComparisonWithNull() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SupertypeOfErrorType.kt")
             public void testSupertypeOfErrorType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeParameterOnLhsOfDot.kt")
             public void testTypeParameterOnLhsOfDot() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedArguments.kt")
             public void testUnresolvedArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolvedOperation.kt")
             public void testUnresolvedOperation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("variableDeclarationInSelector.kt")
             public void testVariableDeclarationInSelector() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DiagnosticWithSyntaxError extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDiagnosticWithSyntaxError() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3869,67 +4597,80 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("arrayExpression.kt")
                 public void testArrayExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("checkBackingFieldException.kt")
                 public void testCheckBackingFieldException() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeFunctionArgumentsOfNestedCalls.kt")
                 public void testCompleteFunctionArgumentsOfNestedCalls() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("funEquals.kt")
                 public void testFunEquals() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("funKeyword.kt")
                 public void testFunKeyword() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("funcitonTypes.kt")
                 public void testFuncitonTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("incompleteEnumReference.kt")
                 public void testIncompleteEnumReference() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("incompleteVal.kt")
                 public void testIncompleteVal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("incompleteValWithAccessor.kt")
                 public void testIncompleteValWithAccessor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("incompleteWhen.kt")
                 public void testIncompleteWhen() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("namedFun.kt")
                 public void testNamedFun() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noTypeParamsInReturnType.kt")
                 public void testNoTypeParamsInReturnType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typeReferenceError.kt")
                 public void testTypeReferenceError() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3943,6 +4684,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/inference")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Inference.Constraints.class, Inference.NestedCalls.class, Inference.Regressions.class, Inference.ReportingImprovements.class, Inference.UpperBounds.class, Inference.Varargs.class})
         public static class Inference extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInInference() throws Exception {
@@ -3951,150 +4693,180 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("arrayConstructor.kt")
             public void testArrayConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/arrayConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/arrayConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cannotCompleteResolveAmbiguity.kt")
             public void testCannotCompleteResolveAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cannotCompleteResolveFunctionLiteralsNoUse.kt")
             public void testCannotCompleteResolveFunctionLiteralsNoUse() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cannotCompleteResolveNoInfoForParameter.kt")
             public void testCannotCompleteResolveNoInfoForParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cannotCompleteResolveNoneApplicable.kt")
             public void testCannotCompleteResolveNoneApplicable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cannotCompleteResolveWithFunctionLiterals.kt")
             public void testCannotCompleteResolveWithFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("completeInferenceIfManyFailed.kt")
             public void testCompleteInferenceIfManyFailed() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conflictingSubstitutions.kt")
             public void testConflictingSubstitutions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dependOnExpectedType.kt")
             public void testDependOnExpectedType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependOnExpectedType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dependantOnVariance.kt")
             public void testDependantOnVariance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dependantOnVarianceNullable.kt")
             public void testDependantOnVarianceNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionPlaceholderError.kt")
             public void testFunctionPlaceholderError() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("hasErrorInConstrainingTypes.kt")
             public void testHasErrorInConstrainingTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inferInFunctionLiterals.kt")
             public void testInferInFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1293.kt")
             public void testKt1293() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/kt1293.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt1293.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3184.kt")
             public void testKt3184() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/kt3184.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt3184.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt619.kt")
             public void testKt619() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/kt619.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/kt619.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("listConstructor.kt")
             public void testListConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/listConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/listConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("mapFunction.kt")
             public void testMapFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/mapFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mapFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("mostSpecificAfterInference.kt")
             public void testMostSpecificAfterInference() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoInferenceFromDeclaredBounds.kt")
             public void testNoInferenceFromDeclaredBounds() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noInformationForParameter.kt")
             public void testNoInformationForParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullableUpperBound.kt")
             public void testNullableUpperBound() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/nullableUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nullableUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("opposite.kt")
             public void testOpposite() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/opposite.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/opposite.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("possibleCycleOnConstraints.kt")
             public void testPossibleCycleOnConstraints() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tryNumberLowerBoundsBeforeUpperBounds.kt")
             public void testTryNumberLowerBoundsBeforeUpperBounds() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeConstructorMismatch.kt")
             public void testTypeConstructorMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeInferenceExpectedTypeMismatch.kt")
             public void testTypeInferenceExpectedTypeMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("useFunctionLiteralsToInferType.kt")
             public void testUseFunctionLiteralsToInferType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/constraints")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Constraints extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInConstraints() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/constraints"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4102,32 +4874,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("constraintOnFunctionLiteral.kt")
                 public void testConstraintOnFunctionLiteral() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("equalityConstraintOnNullableType.kt")
                 public void testEqualityConstraintOnNullableType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("notNullConstraintOnNullableType.kt")
                 public void testNotNullConstraintOnNullableType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("subtypeConstraintOnNullableType.kt")
                 public void testSubtypeConstraintOnNullableType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("supertypeConstraintOnNullableType.kt")
                 public void testSupertypeConstraintOnNullableType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NestedCalls extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInNestedCalls() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4135,62 +4913,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("arrayAccess.kt")
                 public void testArrayAccess() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("binaryExpressions.kt")
                 public void testBinaryExpressions() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("checkTypesForQualifiedProperties.kt")
                 public void testCheckTypesForQualifiedProperties() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeNestedCallsForArraySetExpression.kt")
                 public void testCompleteNestedCallsForArraySetExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeNestedCallsInference.kt")
                 public void testCompleteNestedCallsInference() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeNestedForVariableAsFunctionCall.kt")
                 public void testCompleteNestedForVariableAsFunctionCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inferenceForNestedBinaryCall.kt")
                 public void testInferenceForNestedBinaryCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3395.kt")
                 public void testKt3395() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3461checkTypes.kt")
                 public void testKt3461checkTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("makeNullableIfSafeCall.kt")
                 public void testMakeNullableIfSafeCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nontrivialCallExpression.kt")
                 public void testNontrivialCallExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/regressions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Regressions extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInRegressions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4198,222 +4988,266 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("compareBy.kt")
                 public void testCompareBy() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/compareBy.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1029.kt")
                 public void testKt1029() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1031.kt")
                 public void testKt1031() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1127.kt")
                 public void testKt1127() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1145.kt")
                 public void testKt1145() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1145.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1358.kt")
                 public void testKt1358() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1358.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1410.kt")
                 public void testKt1410() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1410.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1558.kt")
                 public void testKt1558() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1558.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1718.kt")
                 public void testKt1718() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1718.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1944.kt")
                 public void testKt1944() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt1944.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2179.kt")
                 public void testKt2179() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2179.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2200.kt")
                 public void testKt2200() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2283.kt")
                 public void testKt2283() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2286.kt")
                 public void testKt2286() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2294.kt")
                 public void testKt2294() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2294.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2320.kt")
                 public void testKt2320() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2320.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2320.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2324.kt")
                 public void testKt2324() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2324.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2407.kt")
                 public void testKt2407() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2407.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2445.kt")
                 public void testKt2445() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2459.kt")
                 public void testKt2459() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2459.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2459.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2484.kt")
                 public void testKt2484() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2484.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2505.kt")
                 public void testKt2505() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2505.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2514.kt")
                 public void testKt2514() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2514.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2741.kt")
                 public void testKt2741() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2838.kt")
                 public void testKt2838() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2841.kt")
                 public void testKt2841() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2841_it.kt")
                 public void testKt2841_it() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2841_it_this.kt")
                 public void testKt2841_it_this() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2841_this.kt")
                 public void testKt2841_this() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2842.kt")
                 public void testKt2842() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2842.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2883.kt")
                 public void testKt2883() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3007.kt")
                 public void testKt3007() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3007.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3007.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3038.kt")
                 public void testKt3038() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3038.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3038.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3150.kt")
                 public void testKt3150() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3150.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3174.kt")
                 public void testKt3174() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3174.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3174.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3301.kt")
                 public void testKt3301() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3301.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3301.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3344.kt")
                 public void testKt3344() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt3344.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt3344.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt702.kt")
                 public void testKt702() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt702.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt702.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt731.kt")
                 public void testKt731() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt731.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt731.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt742.kt")
                 public void testKt742() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt742.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt742.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt832.kt")
                 public void testKt832() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt832.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt832.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt943.kt")
                 public void testKt943() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt943.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt943.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt948.kt")
                 public void testKt948() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/regressions/kt948.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/regressions/kt948.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ReportingImprovements extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInReportingImprovements() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4421,32 +5255,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("cannotInferParameterTypeWithInference.kt")
                 public void testCannotInferParameterTypeWithInference() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ErrorTypeAsGenericParameter.kt")
                 public void testErrorTypeAsGenericParameter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunctionPlaceholder.kt")
                 public void testFunctionPlaceholder() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NoAmbiguityForDifferentFunctionTypes.kt")
                 public void testNoAmbiguityForDifferentFunctionTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("subtypeForInvariantWithErrorGenerics.kt")
                 public void testSubtypeForInvariantWithErrorGenerics() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/upperBounds")
+            @TestDataPath("$PROJECT_ROOT")
             public static class UpperBounds extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInUpperBounds() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/upperBounds"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4454,42 +5294,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("conflictingSubstitutionsFromUpperBound.kt")
                 public void testConflictingSubstitutionsFromUpperBound() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("doNotInferFromBoundsOnly.kt")
                 public void testDoNotInferFromBoundsOnly() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("intersectUpperBounds.kt")
                 public void testIntersectUpperBounds() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2856.kt")
                 public void testKt2856() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nonNullUpperBound.kt")
                 public void testNonNullUpperBound() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("useBoundsIfUnknownParameters.kt")
                 public void testUseBoundsIfUnknownParameters() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("useBoundsToInferTypeParamsSimple.kt")
                 public void testUseBoundsToInferTypeParamsSimple() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inference/varargs")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Varargs extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInVarargs() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/varargs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4497,7 +5345,8 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("varargsAndPair.kt")
                 public void testVarargsAndPair() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -4516,6 +5365,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/infos")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Infos extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInInfos() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/infos"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4523,17 +5373,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("Autocasts.kt")
             public void testAutocasts() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/infos/Autocasts.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/Autocasts.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertiesWithBackingFields.kt")
             public void testPropertiesWithBackingFields() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/inline")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Inline.BinaryExpressions.class, Inline.NonLocalReturns.class, Inline.NonPublicMember.class, Inline.Regressions.class, Inline.UnaryExpressions.class})
         public static class Inline extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInInline() throws Exception {
@@ -4542,120 +5395,144 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("anonymousObjects.kt")
             public void testAnonymousObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/anonymousObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/anonymousObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("assignment.kt")
             public void testAssignment() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/assignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/assignment.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("capture.kt")
             public void testCapture() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/capture.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/capture.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructor.kt")
             public void testConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/constructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("default.kt")
             public void testDefault() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/default.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/default.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionOnFunction.kt")
             public void testExtensionOnFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/extensionOnFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/extensionOnFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("fromInlineToNoInline.kt")
             public void testFromInlineToNoInline() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functions.kt")
             public void testFunctions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/functions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/functions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invoke.kt")
             public void testInvoke() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/invoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/invoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("labeled.kt")
             public void testLabeled() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/labeled.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/labeled.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nonVirtualMembersWithInline.kt")
             public void testNonVirtualMembersWithInline() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nothingToInline.kt")
             public void testNothingToInline() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/nothingToInline.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nothingToInline.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullabilityOperations.kt")
             public void testNullabilityOperations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/nullabilityOperations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullabilityOperations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullableFunction.kt")
             public void testNullableFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/nullableFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nullableFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("parenthesized.kt")
             public void testParenthesized() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/parenthesized.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/parenthesized.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propagation.kt")
             public void testPropagation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/propagation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/propagation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursion.kt")
             public void testRecursion() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/recursion.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/recursion.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returns.kt")
             public void testReturns() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/returns.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/returns.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("sam.kt")
             public void testSam() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/sam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/sam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typed.kt")
             public void testTyped() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/typed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/typed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unsupportedConstruction.kt")
             public void testUnsupportedConstruction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/unsupportedConstruction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unsupportedConstruction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("vararg.kt")
             public void testVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/vararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/vararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongUsage.kt")
             public void testWrongUsage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inline/wrongUsage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/wrongUsage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class BinaryExpressions extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInBinaryExpressions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/binaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4663,47 +5540,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("andOr.kt")
                 public void testAndOr() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("arrayAccess.kt")
                 public void testArrayAccess() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("assignment.kt")
                 public void testAssignment() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("comparison.kt")
                 public void testComparison() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("componentAccess.kt")
                 public void testComponentAccess() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("contains.kt")
                 public void testContains() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mathOperations.kt")
                 public void testMathOperations() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("rangeTo.kt")
                 public void testRangeTo() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NonLocalReturns extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInNonLocalReturns() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4711,82 +5597,98 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("anonymousObjects.kt")
                 public void testAnonymousObjects() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("anonymousObjectsNested.kt")
                 public void testAnonymousObjectsNested() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("explicitReturnType.kt")
                 public void testExplicitReturnType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("fromOnlyLocal.kt")
                 public void testFromOnlyLocal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inlineLambda.kt")
                 public void testInlineLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("labeledReturn.kt")
                 public void testLabeledReturn() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("lambdaWithGlobalReturnsInsideOnlyLocalOne.kt")
                 public void testLambdaWithGlobalReturnsInsideOnlyLocalOne() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localFun.kt")
                 public void testLocalFun() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedNonLocals.kt")
                 public void testNestedNonLocals() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noInlineLambda.kt")
                 public void testNoInlineLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nonInlinedClass.kt")
                 public void testNonInlinedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onlyLocalReturnLambda.kt")
                 public void testOnlyLocalReturnLambda() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onlyLocalReturnLambdaBinaryExpr.kt")
                 public void testOnlyLocalReturnLambdaBinaryExpr() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("propertyAccessorsAndConstructor.kt")
                 public void testPropertyAccessorsAndConstructor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("toOnlyLocal.kt")
                 public void testToOnlyLocal() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NonPublicMember extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInNonPublicMember() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonPublicMember"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4794,42 +5696,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("inNonPublicClass.kt")
                 public void testInNonPublicClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inNonPublicInnerClass.kt")
                 public void testInNonPublicInnerClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inPackage.kt")
                 public void testInPackage() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inPublicClass.kt")
                 public void testInPublicClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localClass2.kt")
                 public void testLocalClass2() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("localFun.kt")
                 public void testLocalFun() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inline/regressions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Regressions extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInRegressions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4837,12 +5747,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("kt4341.kt")
                 public void testKt4341() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/regressions/kt4341.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/regressions/kt4341.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class UnaryExpressions extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInUnaryExpressions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/unaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4850,17 +5762,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("mathOperation.kt")
                 public void testMathOperation() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("notOnCall.kt")
                 public void testNotOnCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("notOperation.kt")
                 public void testNotOperation() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -4878,6 +5793,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/inner")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Inner.QualifiedExpression.class})
         public static class Inner extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInInner() throws Exception {
@@ -4886,145 +5802,174 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("classesInClassObjectHeader.kt")
             public void testClassesInClassObjectHeader() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorAccess.kt")
             public void testConstructorAccess() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/constructorAccess.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/constructorAccess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("deepInnerClass.kt")
             public void testDeepInnerClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/deepInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/deepInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumEntries.kt")
             public void testEnumEntries() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/enumEntries.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/enumEntries.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFun.kt")
             public void testExtensionFun() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/extensionFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionLambdaInsideNestedClass.kt")
             public void testExtensionLambdaInsideNestedClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("illegalModifier.kt")
             public void testIllegalModifier() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/illegalModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/illegalModifier.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerClassesInStaticParameters.kt")
             public void testInnerClassesInStaticParameters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerErrorForClassObjects.kt")
             public void testInnerErrorForClassObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerErrorForObjects.kt")
             public void testInnerErrorForObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/innerErrorForObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerErrorForObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerThisSuper.kt")
             public void testInnerThisSuper() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/innerThisSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/innerThisSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClassInsideNested.kt")
             public void testLocalClassInsideNested() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/localClassInsideNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localClassInsideNested.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localThisSuper.kt")
             public void testLocalThisSuper() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/localThisSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/localThisSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("modality.kt")
             public void testModality() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/modality.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/modality.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClassAccessedViaInstanceReference.kt")
             public void testNestedClassAccessedViaInstanceReference() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClassExtendsOuter.kt")
             public void testNestedClassExtendsOuter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClassExtendsOuterGeneric.kt")
             public void testNestedClassExtendsOuterGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClassNotAllowed.kt")
             public void testNestedClassNotAllowed() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedVsInnerAccessOuterMember.kt")
             public void testNestedVsInnerAccessOuterMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("outerGenericParam.kt")
             public void testOuterGenericParam() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/outerGenericParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerGenericParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("outerProtectedMember.kt")
             public void testOuterProtectedMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerProtectedMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("outerSuperClassMember.kt")
             public void testOuterSuperClassMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/outerSuperClassMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/outerSuperClassMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("referenceToSelfInLocal.kt")
             public void testReferenceToSelfInLocal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolvePackageClassInObjects.kt")
             public void testResolvePackageClassInObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("selfAnnotationForClassObject.kt")
             public void testSelfAnnotationForClassObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("traits.kt")
             public void testTraits() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/traits.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/traits.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("visibility.kt")
             public void testVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/inner/visibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/visibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression")
+            @TestDataPath("$PROJECT_ROOT")
             public static class QualifiedExpression extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInQualifiedExpression() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5032,52 +5977,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("classObjectOfNestedClass.kt")
                 public void testClassObjectOfNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("constructNestedClass.kt")
                 public void testConstructNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("dataLocalVariable.kt")
                 public void testDataLocalVariable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enumConstant.kt")
                 public void testEnumConstant() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("genericNestedClass.kt")
                 public void testGenericNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("importNestedClass.kt")
                 public void testImportNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedClassInPackage.kt")
                 public void testNestedClassInPackage() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedEnumConstant.kt")
                 public void testNestedEnumConstant() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedObjects.kt")
                 public void testNestedObjects() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("typePosition.kt")
                 public void testTypePosition() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -5091,10 +6046,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/j+k")
+        @TestDataPath("$PROJECT_ROOT")
         public static class J_k extends AbstractJetDiagnosticsTest {
             @TestMetadata("accessClassObjectFromJava.kt")
             public void testAccessClassObjectFromJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInJ_k() throws Exception {
@@ -5103,162 +6060,194 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ambiguousSamAdapters.kt")
             public void testAmbiguousSamAdapters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cantDeclareIfSamAdapterIsInherited.kt")
             public void testCantDeclareIfSamAdapterIsInherited() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inheritAbstractSamAdapter.kt")
             public void testInheritAbstractSamAdapter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerNestedClassFromJava.kt")
             public void testInnerNestedClassFromJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invisiblePackagePrivateInheritedMember.kt")
             public void testInvisiblePackagePrivateInheritedMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KJKInheritance.kt")
             public void testKJKInheritance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/KJKInheritance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KJKInheritanceGeneric.kt")
             public void testKJKInheritanceGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1402.kt")
             public void testKt1402() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt1402.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1402.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1431.kt")
             public void testKt1431() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt1431.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt1431.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2152.kt")
             public void testKt2152() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2152.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2152.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2394.kt")
             public void testKt2394() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2394.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2394.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2606.kt")
             public void testKt2606() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2606.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2606.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2619.kt")
             public void testKt2619() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2619.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2619.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2641.kt")
             public void testKt2641() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2641.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2641.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2890.kt")
             public void testKt2890() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt2890.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt2890.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3307.kt")
             public void testKt3307() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt3307.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3307.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3311.kt")
             public void testKt3311() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/kt3311.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/kt3311.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("mutableIterator.kt")
             public void testMutableIterator() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/mutableIterator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/mutableIterator.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("overrideRawType.kt")
             public void testOverrideRawType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/overrideRawType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/overrideRawType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideVararg.kt")
             public void testOverrideVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/OverrideVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/OverrideVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("packageVisibility.kt")
             public void testPackageVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/packageVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/packageVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("protectedStaticSamePackage.kt")
             public void testProtectedStaticSamePackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursiveRawUpperBound.kt")
             public void testRecursiveRawUpperBound() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("samInConstructorWithGenerics.kt")
             public void testSamInConstructorWithGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/Simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/Simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("StaticMembersFromSuperclasses.kt")
             public void testStaticMembersFromSuperclasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SupertypeArgumentsNullability-NotNull-SpecialTypes.kt")
             public void testSupertypeArgumentsNullability_NotNull_SpecialTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SupertypeArgumentsNullability-NotNull-UserTypes.kt")
             public void testSupertypeArgumentsNullability_NotNull_UserTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SupertypeArgumentsNullability-SpecialTypes.kt")
             public void testSupertypeArgumentsNullability_SpecialTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SupertypeArgumentsNullability-UserTypes.kt")
             public void testSupertypeArgumentsNullability_UserTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UnboxingNulls.kt")
             public void testUnboxingNulls() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/j+k/UnboxingNulls.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Jdk_annotations.Sql.class})
         public static class Jdk_annotations extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInJdk_annotations() throws Exception {
@@ -5267,20 +6256,24 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ArrayListAndMap.kt")
             public void testArrayListAndMap() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayListClone.kt")
             public void testArrayListClone() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayListToArray.kt")
             public void testArrayListToArray() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Sql extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInSql() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5288,17 +6281,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("DriverManager.kt")
                 public void testDriverManager() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ResultSet.kt")
                 public void testResultSet() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Statement.kt")
                 public void testStatement() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -5312,6 +6308,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/labels")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Labels extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInLabels() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/labels"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5319,57 +6316,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("kt1703.kt")
             public void testKt1703() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt1703.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt1703.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt361.kt")
             public void testKt361() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt361.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt361.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3920.kt")
             public void testKt3920() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt3920.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3920.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3988.kt")
             public void testKt3988() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt3988.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt3988.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4247.kt")
             public void testKt4247() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt4247.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4247.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4586.kt")
             public void testKt4586() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt4586.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4586.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4603.kt")
             public void testKt4603() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt4603.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt4603.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt591.kt")
             public void testKt591() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/kt591.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/kt591.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("labelReferencesInsideObjectExpressions.kt")
             public void testLabelReferencesInsideObjectExpressions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("labelsMustBeNamed.kt")
             public void testLabelsMustBeNamed() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/library")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Library extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5377,17 +6385,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("Collections.kt")
             public void testCollections() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/library/Collections.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/Collections.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt828.kt")
             public void testKt828() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/library/kt828.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/library/kt828.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/multimodule")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Multimodule.DuplicateClass.class, Multimodule.DuplicateMethod.class, Multimodule.DuplicateSuper.class})
         public static class Multimodule extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInMultimodule() throws Exception {
@@ -5396,15 +6407,18 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/multimodule/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("packagePrivate.kt")
             public void testPackagePrivate() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/packagePrivate.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DuplicateClass extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDuplicateClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5412,72 +6426,86 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("collectionMethodStub.kt")
                 public void testCollectionMethodStub() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentGenericArguments.kt")
                 public void testDifferentGenericArguments() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentGenericArgumentsReversed.kt")
                 public void testDifferentGenericArgumentsReversed() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("duplicateClass.kt")
                 public void testDuplicateClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("duplicateNestedClasses.kt")
                 public void testDuplicateNestedClasses() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("duplicateSuperClass.kt")
                 public void testDuplicateSuperClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("genericArgumentNumberMismatch.kt")
                 public void testGenericArgumentNumberMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("genericSuperClass.kt")
                 public void testGenericSuperClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inTheSameModuleWithUsage.kt")
                 public void testInTheSameModuleWithUsage() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("inTheSameModuleWithUsageNoTypeAnnotation.kt")
                 public void testInTheSameModuleWithUsageNoTypeAnnotation() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("members.kt")
                 public void testMembers() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameClassNameDifferentPackages.kt")
                 public void testSameClassNameDifferentPackages() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameGenericArguments.kt")
                 public void testSameGenericArguments() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DuplicateMethod extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDuplicateMethod() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateMethod"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5485,122 +6513,146 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("classGenericsInParams.kt")
                 public void testClassGenericsInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classGenericsInParamsBoundMismatch.kt")
                 public void testClassGenericsInParamsBoundMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classGenericsInParamsIndexMismatch.kt")
                 public void testClassGenericsInParamsIndexMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classGenericsInParamsNameMismatch.kt")
                 public void testClassGenericsInParamsNameMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classGenericsInReturnType.kt")
                 public void testClassGenericsInReturnType() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("classVsFunctionGenericsInParamsMismatch.kt")
                 public void testClassVsFunctionGenericsInParamsMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("covariantReturnTypes.kt")
                 public void testCovariantReturnTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differenceInParamNames.kt")
                 public void testDifferenceInParamNames() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentGenericsInParams.kt")
                 public void testDifferentGenericsInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentNumberOfParams.kt")
                 public void testDifferentNumberOfParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentReturnTypes.kt")
                 public void testDifferentReturnTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("extensionMatch.kt")
                 public void testExtensionMatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParams.kt")
                 public void testFunctionGenericsInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParamsBoundsMismatch.kt")
                 public void testFunctionGenericsInParamsBoundsMismatch() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParamsEqNull.kt")
                 public void testFunctionGenericsInParamsEqNull() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParamsNotIs.kt")
                 public void testFunctionGenericsInParamsNotIs() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParamsReturnFooT.kt")
                 public void testFunctionGenericsInParamsReturnFooT() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("functionGenericsInParamsReturnT.kt")
                 public void testFunctionGenericsInParamsReturnT() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noGenericsInParams.kt")
                 public void testNoGenericsInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noParams.kt")
                 public void testNoParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameGenericsInParams.kt")
                 public void testSameGenericsInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWithInheritance.kt")
                 public void testSimpleWithInheritance() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("substitutedGenericInParams.kt")
                 public void testSubstitutedGenericInParams() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DuplicateSuper extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInDuplicateSuper() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5608,22 +6660,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("differentSuperTraits.kt")
                 public void testDifferentSuperTraits() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameSuperTrait.kt")
                 public void testSameSuperTrait() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameSuperTraitDifferentBounds.kt")
                 public void testSameSuperTraitDifferentBounds() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("sameSuperTraitGenerics.kt")
                 public void testSameSuperTraitGenerics() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -5639,6 +6695,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/namedArguments")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NamedArguments extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInNamedArguments() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5646,37 +6703,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("allowForJavaAnnotation.kt")
             public void testAllowForJavaAnnotation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("disallowForJavaConstructor.kt")
             public void testDisallowForJavaConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("disallowForJavaMethods.kt")
             public void testDisallowForJavaMethods() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("disallowForSamAdapterConstructor.kt")
             public void testDisallowForSamAdapterConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("disallowForSamAdapterFunction.kt")
             public void testDisallowForSamAdapterFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namedArgumentsAndDefaultValues.kt")
             public void testNamedArgumentsAndDefaultValues() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NullabilityAndAutoCasts extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInNullabilityAndAutoCasts() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5684,162 +6748,194 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AssertNotNull.kt")
             public void testAssertNotNull() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dataFlowInfoAfterExclExcl.kt")
             public void testDataFlowInfoAfterExclExcl() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/dataFlowInfoAfterExclExcl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/dataFlowInfoAfterExclExcl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("equalityUnderNotNullCheck.kt")
             public void testEqualityUnderNotNullCheck() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/equalityUnderNotNullCheck.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/equalityUnderNotNullCheck.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funcLiteralArgsInsideAmbiguity.kt")
             public void testFuncLiteralArgsInsideAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/funcLiteralArgsInsideAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/funcLiteralArgsInsideAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funcLiteralArgsInsideUnresolvedFunction.kt")
             public void testFuncLiteralArgsInsideUnresolvedFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/funcLiteralArgsInsideUnresolvedFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/funcLiteralArgsInsideUnresolvedFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InfixCallNullability.kt")
             public void testInfixCallNullability() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/InfixCallNullability.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/InfixCallNullability.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1270.kt")
             public void testKt1270() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1270.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1270.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1680.kt")
             public void testKt1680() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1680.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1680.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1778.kt")
             public void testKt1778() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1778.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt1778.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2109.kt")
             public void testKt2109() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2109.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2109.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2125.kt")
             public void testKt2125() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2125.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2125.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2146.kt")
             public void testKt2146() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2146.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2146.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2164.kt")
             public void testKt2164() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2164.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2164.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2176.kt")
             public void testKt2176() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2176.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2176.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2195.kt")
             public void testKt2195() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2195.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2195.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2212.kt")
             public void testKt2212() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2212.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2212.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2216.kt")
             public void testKt2216() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2216.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2216.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2223.kt")
             public void testKt2223() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2223.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2223.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2234.kt")
             public void testKt2234() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2234.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2234.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2336.kt")
             public void testKt2336() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2336.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt2336.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt244.kt")
             public void testKt244() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt244.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt244.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt362.kt")
             public void testKt362() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/kt362.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noUnnecessaryNotNullAssertionOnErrorType.kt")
             public void testNoUnnecessaryNotNullAssertionOnErrorType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/noUnnecessaryNotNullAssertionOnErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/noUnnecessaryNotNullAssertionOnErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NullableNothingIsExactlyNull.kt")
             public void testNullableNothingIsExactlyNull() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/NullableNothingIsExactlyNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PreferExtensionsOnNullableReceiver.kt")
             public void testPreferExtensionsOnNullableReceiver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/PreferExtensionsOnNullableReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("QualifiedExpressionNullability.kt")
             public void testQualifiedExpressionNullability() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/QualifiedExpressionNullability.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/QualifiedExpressionNullability.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReceiverNullability.kt")
             public void testReceiverNullability() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/ReceiverNullability.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/ReceiverNullability.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SenselessNullInWhen.kt")
             public void testSenselessNullInWhen() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/SenselessNullInWhen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/SenselessNullInWhen.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("senslessComparisonWithNullOnTypeParameters.kt")
             public void testSenslessComparisonWithNullOnTypeParameters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/senslessComparisonWithNullOnTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/senslessComparisonWithNullOnTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("smartCastedReceiverWithGenerics.kt")
             public void testSmartCastedReceiverWithGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/smartCastedReceiverWithGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/smartCastedReceiverWithGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("smartCastsAndBooleanExpressions.kt")
             public void testSmartCastsAndBooleanExpressions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/smartCastsAndBooleanExpressions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/smartCastsAndBooleanExpressions.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/nullableTypes")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NullableTypes extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInNullableTypes() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullableTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5847,42 +6943,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("baseWithNullableUpperBound.kt")
             public void testBaseWithNullableUpperBound() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullAssertOnTypeWithNullableUpperBound.kt")
             public void testNullAssertOnTypeWithNullableUpperBound() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullableArgumentForIn.kt")
             public void testNullableArgumentForIn() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("redundantNullable.kt")
             public void testRedundantNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("redundantNullableInSupertype.kt")
             public void testRedundantNullableInSupertype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("safeCallOnTypeWithNullableUpperBound.kt")
             public void testSafeCallOnTypeWithNullableUpperBound() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uselessElvis.kt")
             public void testUselessElvis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/numbers")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Numbers extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInNumbers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/numbers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5890,27 +6994,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("characterIsNotANumber.kt")
             public void testCharacterIsNotANumber() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doublesInSimpleConstraints.kt")
             public void testDoublesInSimpleConstraints() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("intValuesOutOfRange.kt")
             public void testIntValuesOutOfRange() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("numbersInSimpleConstraints.kt")
             public void testNumbersInSimpleConstraints() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/objects")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Objects extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInObjects() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/objects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5918,62 +7027,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("invokeOnInnerObject.kt")
             public void testInvokeOnInnerObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2240.kt")
             public void testKt2240() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/kt2240.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt2240.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt5527.kt")
             public void testKt5527() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/kt5527.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/kt5527.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localObjectInsideObject.kt")
             public void testLocalObjectInsideObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/localObjectInsideObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjectInsideObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localObjects.kt")
             public void testLocalObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/localObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/localObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectLiteralExpressionTypeMismatch.kt")
             public void testObjectLiteralExpressionTypeMismatch() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Objects.kt")
             public void testObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/Objects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/Objects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectsInheritance.kt")
             public void testObjectsInheritance() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/ObjectsInheritance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsInheritance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectsLocal.kt")
             public void testObjectsLocal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/ObjectsLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsLocal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectsNested.kt")
             public void testObjectsNested() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/ObjectsNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/ObjectsNested.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("upperBoundViolated.kt")
             public void testUpperBoundViolated() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/objects/upperBoundViolated.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading")
+        @TestDataPath("$PROJECT_ROOT")
         public static class OperatorsOverloading extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInOperatorsOverloading() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/operatorsOverloading"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5981,37 +7102,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AssignOperatorAmbiguity.kt")
             public void testAssignOperatorAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AssignmentOperations.kt")
             public void testAssignmentOperations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("assignmentOperationsCheckReturnType.kt")
             public void testAssignmentOperationsCheckReturnType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IteratorAmbiguity.kt")
             public void testIteratorAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1028.kt")
             public void testKt1028() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3450.kt")
             public void testKt3450() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/overload")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Overload extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInOverload() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -6019,107 +7147,128 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ConflictingOverloadsFunsDifferentReturnInClass.kt")
             public void testConflictingOverloadsFunsDifferentReturnInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsFunsDifferentReturnInPackage.kt")
             public void testConflictingOverloadsFunsDifferentReturnInPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsIdenticalExtFunsInPackage.kt")
             public void testConflictingOverloadsIdenticalExtFunsInPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsIdenticalFunsInClass.kt")
             public void testConflictingOverloadsIdenticalFunsInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsIdenticalFunsTPInClass.kt")
             public void testConflictingOverloadsIdenticalFunsTPInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsIdenticalValsInClass.kt")
             public void testConflictingOverloadsIdenticalValsInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingOverloadsValsDifferentTypeInClass.kt")
             public void testConflictingOverloadsValsDifferentTypeInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorVsFunOverload.kt")
             public void testConstructorVsFunOverload() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtFunDifferentReceiver.kt")
             public void testExtFunDifferentReceiver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunNoConflictInDifferentPackages.kt")
             public void testFunNoConflictInDifferentPackages() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1998.kt")
             public void testKt1998() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/kt1998.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/kt1998.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverloadFunRegularAndExt.kt")
             public void testOverloadFunRegularAndExt() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverloadVarAndFunInClass.kt")
             public void testOverloadVarAndFunInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SyntheticAndNotSynthetic.kt")
             public void testSyntheticAndNotSynthetic() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/override")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Override.ParameterNames.class})
         public static class Override extends AbstractJetDiagnosticsTest {
             @TestMetadata("AbstractFunImplemented.kt")
             public void testAbstractFunImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunImplemented.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractFunNotImplemented.kt")
             public void testAbstractFunNotImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractValImplemented.kt")
             public void testAbstractValImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractValImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValImplemented.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractValNotImplemented.kt")
             public void testAbstractValNotImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractVarImplemented.kt")
             public void testAbstractVarImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractVarImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarImplemented.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AbstractVarNotImplemented.kt")
             public void testAbstractVarNotImplemented() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInOverride() throws Exception {
@@ -6128,220 +7277,264 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AllPrivateFromSuperTypes.kt")
             public void testAllPrivateFromSuperTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AllProtectedFromSupertypes.kt")
             public void testAllProtectedFromSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CannotInferVisibilityForProperty.kt")
             public void testCannotInferVisibilityForProperty() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CannotInferVisibilityForPropertySetter.kt")
             public void testCannotInferVisibilityForPropertySetter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ComplexValRedeclaration.kt")
             public void testComplexValRedeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingFunctionSignatureFromSuperclass.kt")
             public void testConflictingFunctionSignatureFromSuperclass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingPropertySignatureFromSuperclass.kt")
             public void testConflictingPropertySignatureFromSuperclass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DefaultParameterValueInOverride.kt")
             public void testDefaultParameterValueInOverride() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt")
             public void testDefaultParameterValues_NoErrorsWhenInheritingFromOneTypeTwice() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/Delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationFun.kt")
             public void testDelegationFun() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DelegationFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationVal.kt")
             public void testDelegationVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DelegationVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegationVar.kt")
             public void testDelegationVar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DelegationVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DelegationVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DuplicateMethod.kt")
             public void testDuplicateMethod() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/DuplicateMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/DuplicateMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EqualityOfIntersectionTypes.kt")
             public void testEqualityOfIntersectionTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtendFunctionClass.kt")
             public void testExtendFunctionClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ExtendFunctionClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ExtendFunctionClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FakeOverrideAbstractAndNonAbstractFun.kt")
             public void testFakeOverrideAbstractAndNonAbstractFun() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FakeOverrideDifferentDeclarationSignatures.kt")
             public void testFakeOverrideDifferentDeclarationSignatures() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Generics.kt")
             public void testGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/Generics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/Generics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InvisiblePotentialOverride.kt")
             public void testInvisiblePotentialOverride() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1862.kt")
             public void testKt1862() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt1862.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt1862.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2052.kt")
             public void testKt2052() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt2052.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2052.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2491.kt")
             public void testKt2491() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt2491.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt2491.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4763.kt")
             public void testKt4763() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt4763.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4763property.kt")
             public void testKt4763property() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt4763property.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4763property.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4785.kt")
             public void testKt4785() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt4785.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4785.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4785classObject.kt")
             public void testKt4785classObject() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt4785classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4785classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4785delegation.kt")
             public void testKt4785delegation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt4785delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt4785delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt880.kt")
             public void testKt880() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/kt880.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/kt880.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MissingDelegate.kt")
             public void testMissingDelegate() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/MissingDelegate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MissingDelegate.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultipleDefaultParametersInSupertypes.kt")
             public void testMultipleDefaultParametersInSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultipleDefaultParametersInSupertypesNoOverride.kt")
             public void testMultipleDefaultParametersInSupertypesNoOverride() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultipleDefaultsAndNamesInSupertypes.kt")
             public void testMultipleDefaultsAndNamesInSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultipleDefaultsInSupertypesNoExplicitOverride.kt")
             public void testMultipleDefaultsInSupertypesNoExplicitOverride() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NonGenerics.kt")
             public void testNonGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/NonGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/NonGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ObjectDelegationManyImpl.kt")
             public void testObjectDelegationManyImpl() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverridingFinalMember.kt")
             public void testOverridingFinalMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/OverridingFinalMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/OverridingFinalMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt")
             public void testParameterDefaultValues_DefaultValueFromOnlyOneSupertype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ParentInheritsManyImplementations.kt")
             public void testParentInheritsManyImplementations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyInConstructor.kt")
             public void testPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/PropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/PropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ProtectedAndPrivateFromSupertypes.kt")
             public void testProtectedAndPrivateFromSupertypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SuspiciousCase1.kt")
             public void testSuspiciousCase1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/SuspiciousCase1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/SuspiciousCase1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ToAbstractMembersFromSuper-kt1996.kt")
             public void testToAbstractMembersFromSuper_kt1996() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/override/parameterNames")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ParameterNames extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInParameterNames() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/parameterNames"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -6349,37 +7542,44 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("changeOnOverrideDiagnostic.kt")
                 public void testChangeOnOverrideDiagnostic() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("differentNamesInSupertypesDiagnostic.kt")
                 public void testDifferentNamesInSupertypesDiagnostic() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("jjkHierarchy.kt")
                 public void testJjkHierarchy() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kjkHierarchy.kt")
                 public void testKjkHierarchy() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kjkWithSeveralSupers.kt")
                 public void testKjkWithSeveralSupers() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kotlinInheritsBothJavaAndKotlin.kt")
                 public void testKotlinInheritsBothJavaAndKotlin() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kotlinInheritsJava.kt")
                 public void testKotlinInheritsJava() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -6393,10 +7593,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/recovery")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Recovery extends AbstractJetDiagnosticsTest {
             @TestMetadata("absentLeftHandSide.kt")
             public void testAbsentLeftHandSide() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInRecovery() throws Exception {
@@ -6405,22 +7607,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("namelessInJava.kt")
             public void testNamelessInJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/recovery/namelessInJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessInJava.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namelessMembers.kt")
             public void testNamelessMembers() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/recovery/namelessMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namelessToplevelDeclarations.kt")
             public void testNamelessToplevelDeclarations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/redeclarations")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Redeclarations extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInRedeclarations() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/redeclarations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -6428,77 +7634,92 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ClassRedeclarationInDifferentFiles.kt")
             public void testClassRedeclarationInDifferentFiles() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConflictingExtensionProperties.kt")
             public void testConflictingExtensionProperties() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2247.kt")
             public void testKt2247() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/kt2247.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2247.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2418.kt")
             public void testKt2418() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2418.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2438.kt")
             public void testKt2438() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/kt2438.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt2438.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt470.kt")
             public void testKt470() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/kt470.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/kt470.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiFilePackageRedeclaration.kt")
             public void testMultiFilePackageRedeclaration() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyAndFunInClass.kt")
             public void testPropertyAndFunInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyAndInnerClass.kt")
             public void testPropertyAndInnerClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RedeclarationInMultiFile.kt")
             public void testRedeclarationInMultiFile() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Redeclarations.kt")
             public void testRedeclarations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/Redeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RedeclarationsInObjects.kt")
             public void testRedeclarationsInObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RedeclaredTypeParameters.kt")
             public void testRedeclaredTypeParameters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SingletonAndFunctionSameName.kt")
             public void testSingletonAndFunctionSameName() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/regressions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Regressions extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInRegressions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -6506,507 +7727,608 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AmbiguityOnLazyTypeComputation.kt")
             public void testAmbiguityOnLazyTypeComputation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AssignmentsUnderOperators.kt")
             public void testAssignmentsUnderOperators() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CoercionToUnit.kt")
             public void testCoercionToUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/CoercionToUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/CoercionToUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DoubleDefine.kt")
             public void testDoubleDefine() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/DoubleDefine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ea40964.kt")
             public void testEa40964() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/ea40964.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea40964.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ea43298.kt")
             public void testEa43298() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/ea43298.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ea43298.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ErrorsOnIbjectExpressionsAsParameters.kt")
             public void testErrorsOnIbjectExpressionsAsParameters() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet11.kt")
             public void testJet11() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet11.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet11.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet121.kt")
             public void testJet121() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet121.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet121.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet124.kt")
             public void testJet124() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet124.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet124.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet169.kt")
             public void testJet169() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet169.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet169.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet17.kt")
             public void testJet17() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet17.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet17.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet183.kt")
             public void testJet183() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet183.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet183-1.kt")
             public void testJet183_1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet183-1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet53.kt")
             public void testJet53() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet53.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet53.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet67.kt")
             public void testJet67() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet67.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet67.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet68.kt")
             public void testJet68() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet68.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet68.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet69.kt")
             public void testJet69() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet69.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet69.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet72.kt")
             public void testJet72() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet72.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet72.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Jet81.kt")
             public void testJet81() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/Jet81.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/Jet81.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt127.kt")
             public void testKt127() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt127.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt127.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt128.kt")
             public void testKt128() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt128.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt128.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1489_1728.kt")
             public void testKt1489_1728() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1550.kt")
             public void testKt1550() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt1550.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1550.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1639-JFrame.kt")
             public void testKt1639_JFrame() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1647.kt")
             public void testKt1647() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt1647.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1647.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1736.kt")
             public void testKt1736() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt1736.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt1736.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt174.kt")
             public void testKt174() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt174.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt174.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt201.kt")
             public void testKt201() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt201.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt201.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt235.kt")
             public void testKt235() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt235.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt235.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2376.kt")
             public void testKt2376() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt2376.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2376.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt251.kt")
             public void testKt251() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt251.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt251.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt258.kt")
             public void testKt258() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt258.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt258.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt26.kt")
             public void testKt26() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt26.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt26-1.kt")
             public void testKt26_1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt26-1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt26-1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2768.kt")
             public void testKt2768() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt2768.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2768.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt282.kt")
             public void testKt282() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt282.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt282.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt287.kt")
             public void testKt287() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt287.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt287.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2956.kt")
             public void testKt2956() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt2956.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt2956.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt302.kt")
             public void testKt302() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt302.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt302.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt306.kt")
             public void testKt306() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt306.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt306.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt307.kt")
             public void testKt307() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt307.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt307.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt312.kt")
             public void testKt312() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt312.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt312.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt313.kt")
             public void testKt313() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt313.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt313.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt316.kt")
             public void testKt316() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt316.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt316.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt328.kt")
             public void testKt328() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt328.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt328.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt334.kt")
             public void testKt334() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt334.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt334.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt335.336.kt")
             public void testKt335_336() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt335.336.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt335.336.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt337.kt")
             public void testKt337() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt337.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt337.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt352.kt")
             public void testKt352() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt352.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt352.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt353.kt")
             public void testKt353() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt353.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt353.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt385.109.441.kt")
             public void testKt385_109_441() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt385.109.441.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt394.kt")
             public void testKt394() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt394.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt394.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt398.kt")
             public void testKt398() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt398.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt398.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt399.kt")
             public void testKt399() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt399.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt399.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt402.kt")
             public void testKt402() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt402.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt402.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt41.kt")
             public void testKt41() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt41.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt41.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt411.kt")
             public void testKt411() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt411.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt411.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt439.kt")
             public void testKt439() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt439.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt439.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt442.kt")
             public void testKt442() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt442.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt442.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt443.kt")
             public void testKt443() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt443.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt443.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt455.kt")
             public void testKt455() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt455.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt455.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt456.kt")
             public void testKt456() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt456.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt456.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt459.kt")
             public void testKt459() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt459.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt459.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt469.kt")
             public void testKt469() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt469.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt469.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4827.kt")
             public void testKt4827() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt4827.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt4827.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt498.kt")
             public void testKt498() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt498.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt498.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt524.kt")
             public void testKt524() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt524.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt524.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt526UnresolvedReferenceInnerStatic.kt")
             public void testKt526UnresolvedReferenceInnerStatic() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt549.kt")
             public void testKt549() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt549.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt549.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt557.kt")
             public void testKt557() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt557.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt557.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt571.kt")
             public void testKt571() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt571.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt571.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt575.kt")
             public void testKt575() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt575.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt575.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt58.kt")
             public void testKt58() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt58.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt58.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt580.kt")
             public void testKt580() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt580.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt580.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt588.kt")
             public void testKt588() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt588.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt588.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt597.kt")
             public void testKt597() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt597.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt597.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt600.kt")
             public void testKt600() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt600.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt600.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt604.kt")
             public void testKt604() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt604.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt604.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt618.kt")
             public void testKt618() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt618.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt618.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt629.kt")
             public void testKt629() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt629.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt629.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt630.kt")
             public void testKt630() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt630.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt630.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt688.kt")
             public void testKt688() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt688.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt688.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt691.kt")
             public void testKt691() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt691.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt691.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt701.kt")
             public void testKt701() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt701.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt701.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt716.kt")
             public void testKt716() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt716.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt716.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt743.kt")
             public void testKt743() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt743.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt743.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt750.kt")
             public void testKt750() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt750.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt750.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt762.kt")
             public void testKt762() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt762.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt762.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt847.kt")
             public void testKt847() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt847.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt847.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt860.kt")
             public void testKt860() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/kt860.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/kt860.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OrphanStarProjection.kt")
             public void testOrphanStarProjection() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OutProjections.kt")
             public void testOutProjections() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/OutProjections.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OutProjections.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideResolution.kt")
             public void testOverrideResolution() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/OverrideResolution.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/OverrideResolution.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveSubclassOfList.kt")
             public void testResolveSubclassOfList() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SpecififcityByReceiver.kt")
             public void testSpecififcityByReceiver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TypeMismatchOnUnaryOperations.kt")
             public void testTypeMismatchOnUnaryOperations() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TypeParameterAsASupertype.kt")
             public void testTypeParameterAsASupertype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UnavaliableQualifiedThis.kt")
             public void testUnavaliableQualifiedThis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WrongTraceInCallResolver.kt")
             public void testWrongTraceInCallResolver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/resolve")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Resolve.Invoke.class, Resolve.NestedCalls.class, Resolve.SpecialConstructions.class})
         public static class Resolve extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInResolve() throws Exception {
@@ -7015,55 +8337,66 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ambiguityOnPropertiesWithTheSamePackageName.kt")
             public void testAmbiguityOnPropertiesWithTheSamePackageName() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("incompleteConstructorInvocation.kt")
             public void testIncompleteConstructorInvocation() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithFunctionLiteralWithId.kt")
             public void testResolveWithFunctionLiteralWithId() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithFunctionLiterals.kt")
             public void testResolveWithFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithFunctionLiteralsOverload.kt")
             public void testResolveWithFunctionLiteralsOverload() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithGenerics.kt")
             public void testResolveWithGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithRedeclarationError.kt")
             public void testResolveWithRedeclarationError() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithSpecifiedFunctionLiteralWithId.kt")
             public void testResolveWithSpecifiedFunctionLiteralWithId() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resolveWithoutGenerics.kt")
             public void testResolveWithoutGenerics() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("wrongNumberOfTypeArguments.kt")
             public void testWrongNumberOfTypeArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Invoke.Errors.class})
             public static class Invoke extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInInvoke() throws Exception {
@@ -7072,55 +8405,66 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("invokeAsExtension.kt")
                 public void testInvokeAsExtension() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeAsMember.kt")
                 public void testInvokeAsMember() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeAsMemberExtension.kt")
                 public void testInvokeAsMemberExtension() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeAsMemberExtensionToExplicitReceiver.kt")
                 public void testInvokeAsMemberExtensionToExplicitReceiver() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("KT-4372.kt")
                 public void testKT_4372() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3772.kt")
                 public void testKt3772() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3772.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt3833-invokeInsideNestedClass.kt")
                 public void testKt3833_invokeInsideNestedClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4204-completeNestedCallsForInvoke.kt")
                 public void testKt4204_completeNestedCallsForInvoke() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4321InvokeOnEnum.kt")
                 public void testKt4321InvokeOnEnum() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("valNamedInvoke.kt")
                 public void testValNamedInvoke() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Errors extends AbstractJetDiagnosticsTest {
                     public void testAllFilesPresentInErrors() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke/errors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7128,42 +8472,50 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                     
                     @TestMetadata("ambiguityForInvoke.kt")
                     public void testAmbiguityForInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("invisibleInvoke.kt")
                     public void testInvisibleInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("receiverPresenceErrorForInvoke.kt")
                     public void testReceiverPresenceErrorForInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("typeInferenceErrorForInvoke.kt")
                     public void testTypeInferenceErrorForInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("unresolvedInvoke.kt")
                     public void testUnresolvedInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("unsafeCallWithInvoke.kt")
                     public void testUnsafeCallWithInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("wrongReceiverForInvokeOnExpression.kt")
                     public void testWrongReceiverForInvokeOnExpression() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("wrongReceiverTypeForInvoke.kt")
                     public void testWrongReceiverTypeForInvoke() throws Exception {
-                        doTest("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt");
+                        doTest(fileName);
                     }
                     
                 }
@@ -7177,6 +8529,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NestedCalls extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInNestedCalls() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7184,32 +8537,38 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("analyzeArgsInFreeExpressionPosition.kt")
                 public void testAnalyzeArgsInFreeExpressionPosition() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("analyzeUnmappedArguments.kt")
                 public void testAnalyzeUnmappedArguments() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("argumentsInParentheses.kt")
                 public void testArgumentsInParentheses() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeTypeInferenceForNestedInNoneApplicable.kt")
                 public void testCompleteTypeInferenceForNestedInNoneApplicable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("completeUnmappedArguments.kt")
                 public void testCompleteUnmappedArguments() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class SpecialConstructions extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInSpecialConstructions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/specialConstructions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7217,17 +8576,20 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("elvisAsCall.kt")
                 public void testElvisAsCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("exclExclAsCall.kt")
                 public void testExclExclAsCall() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("reportTypeMismatchDeeplyOnBranches.kt")
                 public void testReportTypeMismatchDeeplyOnBranches() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -7243,6 +8605,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/scopes")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Scopes extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInScopes() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7250,227 +8613,272 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AmbiguityBetweenRootAndPackage.kt")
             public void testAmbiguityBetweenRootAndPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AmbiguousNonExtensions.kt")
             public void testAmbiguousNonExtensions() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DontImportRootScope.kt")
             public void testDontImportRootScope() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportFromCurrentWithDifferentName.kt")
             public void testImportFromCurrentWithDifferentName() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportObjectAndUseAsSupertype.kt")
             public void testImportObjectAndUseAsSupertype() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportObjectHidesCurrentPackage.kt")
             public void testImportObjectHidesCurrentPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportTwoTimes.kt")
             public void testImportTwoTimes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportTwoTimesStar.kt")
             public void testImportTwoTimesStar() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Imports.kt")
             public void testImports() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/Imports.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/Imports.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportsConflicting.kt")
             public void testImportsConflicting() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsConflicting.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportsUselessSimpleImport.kt")
             public void testImportsUselessSimpleImport() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ImportsUselessSimpleImport2.kt")
             public void testImportsUselessSimpleImport2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Imports-hidden.kt")
             public void testImports_hidden() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("initializerScopeOfExtensionProperty.kt")
             public void testInitializerScopeOfExtensionProperty() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1078.kt")
             public void testKt1078() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1078.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1078.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1080.kt")
             public void testKt1080() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1080.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1080.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1244.kt")
             public void testKt1244() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1244.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1244.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1248.kt")
             public void testKt1248() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1248.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1248.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt151.kt")
             public void testKt151() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt151.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt151.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1579.kt")
             public void testKt1579() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1579.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1579_map_entry.kt")
             public void testKt1579_map_entry() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1580.kt")
             public void testKt1580() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1580.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1580.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1642.kt")
             public void testKt1642() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1642.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1642.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1738.kt")
             public void testKt1738() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1738.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1738.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1805.kt")
             public void testKt1805() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1805.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1805.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1806.kt")
             public void testKt1806() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1806.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1806.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1822.kt")
             public void testKt1822() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1822.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1822.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1942.kt")
             public void testKt1942() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt1942.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt1942.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2262.kt")
             public void testKt2262() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt2262.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt2262.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt250.617.10.kt")
             public void testKt250_617_10() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt250.617.10.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt250.617.10.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt323.kt")
             public void testKt323() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt323.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt323.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt37.kt")
             public void testKt37() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt37.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt37.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt421Scopes.kt")
             public void testKt421Scopes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt587.kt")
             public void testKt587() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt587.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt587.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt900.kt")
             public void testKt900() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt900.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt900-1.kt")
             public void testKt900_1() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt900-1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt900-2.kt")
             public void testKt900_2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt900-2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt900-2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt939.kt")
             public void testKt939() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt939.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt939.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt955.kt")
             public void testKt955() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/kt955.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt955.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoAmbiguityBetweenRootAndPackage.kt")
             public void testNoAmbiguityBetweenRootAndPackage() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("stopResolutionOnAmbiguity.kt")
             public void testStopResolutionOnAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("visibility.kt")
             public void testVisibility() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/visibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("visibility2.kt")
             public void testVisibility2() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/visibility2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/visibility2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VisibilityInheritModifier.kt")
             public void testVisibilityInheritModifier() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/senselessComparison")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SenselessComparison extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInSenselessComparison() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/senselessComparison"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7478,12 +8886,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("parenthesized.kt")
             public void testParenthesized() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/senselessComparison/parenthesized.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/senselessComparison/parenthesized.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/shadowing")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Shadowing extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInShadowing() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/shadowing"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7491,62 +8901,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ShadowMultiDeclarationWithFunParameter.kt")
             public void testShadowMultiDeclarationWithFunParameter() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowParameterInFunctionBody.kt")
             public void testShadowParameterInFunctionBody() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowParameterInNestedBlockInFor.kt")
             public void testShadowParameterInNestedBlockInFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowPropertyInClosure.kt")
             public void testShadowPropertyInClosure() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowPropertyInFor.kt")
             public void testShadowPropertyInFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowPropertyInFunction.kt")
             public void testShadowPropertyInFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowVariableInFor.kt")
             public void testShadowVariableInFor() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowVariableInNestedBlock.kt")
             public void testShadowVariableInNestedBlock() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowVariableInNestedClosure.kt")
             public void testShadowVariableInNestedClosure() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ShadowVariableInNestedClosureParam.kt")
             public void testShadowVariableInNestedClosureParam() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/smartCasts")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({SmartCasts.Inference.class})
         public static class SmartCasts extends AbstractJetDiagnosticsTest {
             @TestMetadata("afterBinaryExpr.kt")
             public void testAfterBinaryExpr() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInSmartCasts() throws Exception {
@@ -7555,55 +8977,66 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("classObjectMember.kt")
             public void testClassObjectMember() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/classObjectMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("combineWithNoSelectorInfo.kt")
             public void testCombineWithNoSelectorInfo() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("dataFlowInfoForArguments.kt")
             public void testDataFlowInfoForArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1461.kt")
             public void testKt1461() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/kt1461.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt1461.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2422.kt")
             public void testKt2422() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/kt2422.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/kt2422.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noErrorCheckForPackageLevelVal.kt")
             public void testNoErrorCheckForPackageLevelVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noUnnecessarySmartCastForReceiver.kt")
             public void testNoUnnecessarySmartCastForReceiver() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicVal.kt")
             public void testPublicVal() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/publicVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/publicVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisWithLabel.kt")
             public void testThisWithLabel() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisWithLabelAsReceiverPart.kt")
             public void testThisWithLabelAsReceiverPart() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/inference")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Inference extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInInference() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/inference"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7611,47 +9044,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("dependentOnPrevArg.kt")
                 public void testDependentOnPrevArg() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("intersectionTypes.kt")
                 public void testIntersectionTypes() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt1355.kt")
                 public void testKt1355() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2746.kt")
                 public void testKt2746() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt2851.kt")
                 public void testKt2851() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4009.kt")
                 public void testKt4009() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4403.kt")
                 public void testKt4403() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("kt4415.kt")
                 public void testKt4415() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("smartCastOnReceiver.kt")
                 public void testSmartCastOnReceiver() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -7665,6 +9107,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/substitutions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Substitutions extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInSubstitutions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/substitutions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7672,27 +9115,32 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("kt1558-short.kt")
             public void testKt1558_short() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt1558-short.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4887.kt")
             public void testKt4887() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/substitutions/kt4887.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/kt4887.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt")
             public void testUpperBoundsSubstitutionForOverloadResolutionWithAmbiguity() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt")
             public void testUpperBoundsSubstitutionForOverloadResolutionWithErrorTypes() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/subtyping")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Subtyping extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInSubtyping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7700,62 +9148,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("kt2069.kt")
             public void testKt2069() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt2069.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2069.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2744.kt")
             public void testKt2744() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt2744.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt2744.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt304.kt")
             public void testKt304() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt304.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt304.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3159.kt")
             public void testKt3159() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt3159.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt3159.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt-1457.kt")
             public void testKt_1457() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/kt-1457.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localAnonymousObjects.kt")
             public void testLocalAnonymousObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClasses.kt")
             public void testLocalClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/localClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/localClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberAnonymousObjects.kt")
             public void testMemberAnonymousObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedIntoLocalClasses.kt")
             public void testNestedIntoLocalClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedLocalClasses.kt")
             public void testNestedLocalClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelAnonymousObjects.kt")
             public void testTopLevelAnonymousObjects() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/suppress")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Suppress.AllWarnings.class, Suppress.ManyWarnings.class, Suppress.OneWarning.class})
         public static class Suppress extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInSuppress() throws Exception {
@@ -7763,6 +9223,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings")
+            @TestDataPath("$PROJECT_ROOT")
             public static class AllWarnings extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInAllWarnings() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7770,47 +9231,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("suppressWarningsOnClass.kt")
                 public void testSuppressWarningsOnClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnClassObject.kt")
                 public void testSuppressWarningsOnClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnExpression.kt")
                 public void testSuppressWarningsOnExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnFunction.kt")
                 public void testSuppressWarningsOnFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnObject.kt")
                 public void testSuppressWarningsOnObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnParameter.kt")
                 public void testSuppressWarningsOnParameter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnProperty.kt")
                 public void testSuppressWarningsOnProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("suppressWarningsOnPropertyAccessor.kt")
                 public void testSuppressWarningsOnPropertyAccessor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ManyWarnings extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInManyWarnings() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/manyWarnings"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7818,52 +9288,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("mixed.kt")
                 public void testMixed() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onClass.kt")
                 public void testOnClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onClassObject.kt")
                 public void testOnClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onExpression.kt")
                 public void testOnExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onFunction.kt")
                 public void testOnFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onObject.kt")
                 public void testOnObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onParameter.kt")
                 public void testOnParameter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onProperty.kt")
                 public void testOnProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onPropertyAccessor.kt")
                 public void testOnPropertyAccessor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning")
+            @TestDataPath("$PROJECT_ROOT")
             public static class OneWarning extends AbstractJetDiagnosticsTest {
                 public void testAllFilesPresentInOneWarning() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/oneWarning"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7871,47 +9351,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
                 
                 @TestMetadata("onClass.kt")
                 public void testOnClass() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onClassObject.kt")
                 public void testOnClassObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onExpression.kt")
                 public void testOnExpression() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onFunction.kt")
                 public void testOnFunction() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onLocalVariable.kt")
                 public void testOnLocalVariable() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onObject.kt")
                 public void testOnObject() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onParameter.kt")
                 public void testOnParameter() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onProperty.kt")
                 public void testOnProperty() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("onPropertyAccessor.kt")
                 public void testOnPropertyAccessor() throws Exception {
-                    doTest("compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -7927,6 +9416,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ThisAndSuper extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInThisAndSuper() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -7934,71 +9424,85 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("ambigousLabelOnThis.kt")
             public void testAmbigousLabelOnThis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notAccessibleSuperInTrait.kt")
             public void testNotAccessibleSuperInTrait() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("QualifiedThis.kt")
             public void testQualifiedThis() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Super.kt")
             public void testSuper() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/Super.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/Super.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("superInExtensionFunction.kt")
             public void testSuperInExtensionFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("superInExtensionFunctionCall.kt")
             public void testSuperInExtensionFunctionCall() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("superInToplevelFunction.kt")
             public void testSuperInToplevelFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("superIsNotAnExpression.kt")
             public void testSuperIsNotAnExpression() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisInFunctionLiterals.kt")
             public void testThisInFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisInInnerClasses.kt")
             public void testThisInInnerClasses() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisInPropertyInitializer.kt")
             public void testThisInPropertyInitializer() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisInToplevelFunction.kt")
             public void testThisInToplevelFunction() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/traitWithRequired")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TraitWithRequired extends AbstractJetDiagnosticsTest {
             @TestMetadata("abstractClass.kt")
             public void testAbstractClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInTraitWithRequired() throws Exception {
@@ -8007,57 +9511,68 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("anonymousObjectExtendsTraitWithRequired.kt")
             public void testAnonymousObjectExtendsTraitWithRequired() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentGenericArguments.kt")
             public void testDifferentGenericArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3006.kt")
             public void testKt3006() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/kt3006.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/kt3006.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("manyRequirementsDisallowed.kt")
             public void testManyRequirementsDisallowed() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("manyTraitsRequireSameClass.kt")
             public void testManyTraitsRequireSameClass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("requirementFulfilledBySubclass.kt")
             public void testRequirementFulfilledBySubclass() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("traitExtendsTraitWithRequired.kt")
             public void testTraitExtendsTraitWithRequired() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("traitRequiresAny.kt")
             public void testTraitRequiresAny() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("traitSupertypeList.kt")
             public void testTraitSupertypeList() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninheritableTraitDifferentGenericArguments.kt")
             public void testUninheritableTraitDifferentGenericArguments() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/typedefs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Typedefs extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInTypedefs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typedefs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8065,12 +9580,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("TypedefsUnsupported.kt")
             public void testTypedefsUnsupported() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/unit")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Unit extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInUnit() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/unit"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8078,12 +9595,14 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("nullableUnit.kt")
             public void testNullableUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/unit/nullableUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/unit/nullableUnit.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/varargs")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Varargs extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInVarargs() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/varargs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8091,62 +9610,74 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AmbiguousVararg.kt")
             public void testAmbiguousVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1781.kt")
             public void testKt1781() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/kt1781.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1781.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1835.kt")
             public void testKt1835() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/kt1835.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1835.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1838-param.kt")
             public void testKt1838_param() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/kt1838-param.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-param.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1838-val.kt")
             public void testKt1838_val() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/kt1838-val.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt1838-val.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt422.kt")
             public void testKt422() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/kt422.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/kt422.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MoreSpecificVarargsOfEqualLength.kt")
             public void testMoreSpecificVarargsOfEqualLength() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MostSepcificVarargsWithJava.kt")
             public void testMostSepcificVarargsWithJava() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NilaryVsVararg.kt")
             public void testNilaryVsVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UnaryVsVararg.kt")
             public void testUnaryVsVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varargsAndFunctionLiterals.kt")
             public void testVarargsAndFunctionLiterals() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/tests/when")
+        @TestDataPath("$PROJECT_ROOT")
         public static class When extends AbstractJetDiagnosticsTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8154,47 +9685,56 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
             
             @TestMetadata("AnnotatedWhenStatement.kt")
             public void testAnnotatedWhenStatement() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseExpectedUnit.kt")
             public void testNoElseExpectedUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseNoExpectedType.kt")
             public void testNoElseNoExpectedType() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseReturnedCoercionToUnit.kt")
             public void testNoElseReturnedCoercionToUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseReturnedFromLambdaExpectedInt.kt")
             public void testNoElseReturnedFromLambdaExpectedInt() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseReturnedNonUnit.kt")
             public void testNoElseReturnedNonUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseReturnedUnit.kt")
             public void testNoElseReturnedUnit() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoElseWhenStatement.kt")
             public void testNoElseWhenStatement() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/NoElseWhenStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("When.kt")
             public void testWhen() throws Exception {
-                doTest("compiler/testData/diagnostics/tests/when/When.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/when/When.kt");
+                doTest(fileName);
             }
             
         }
@@ -8264,10 +9804,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
     }
     
     @TestMetadata("compiler/testData/diagnostics/tests/script")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Script extends AbstractJetDiagnosticsTest {
         @TestMetadata("AccessForwardDeclarationInScript.kts")
         public void testAccessForwardDeclarationInScript() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.kts");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.kts");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInScript() throws Exception {
@@ -8276,22 +9818,26 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         
         @TestMetadata("ComplexScript.kts")
         public void testComplexScript() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/script/ComplexScript.kts");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/ComplexScript.kts");
+            doTest(fileName);
         }
         
         @TestMetadata("imports.kts")
         public void testImports() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/script/imports.kts");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/imports.kts");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleScript.kts")
         public void testSimpleScript() throws Exception {
-            doTest("compiler/testData/diagnostics/tests/script/SimpleScript.kts");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/SimpleScript.kts");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TailRecursion extends AbstractJetDiagnosticsTest {
         public void testAllFilesPresentInTailRecursion() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8299,187 +9845,224 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         
         @TestMetadata("defaultArgs.kt")
         public void testDefaultArgs() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionTailCall.kt")
         public void testExtensionTailCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionWithNoTails.kt")
         public void testFunctionWithNoTails() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionWithNonTailRecursions.kt")
         public void testFunctionWithNonTailRecursions() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionWithoutAnnotation.kt")
         public void testFunctionWithoutAnnotation() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCall.kt")
         public void testInfixCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixRecursiveCall.kt")
         public void testInfixRecursiveCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insideElvis.kt")
         public void testInsideElvis() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeledThisReferences.kt")
         public void testLabeledThisReferences() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("loops.kt")
         public void testLoops() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/loops.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/loops.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilevelBlocks.kt")
         public void testMultilevelBlocks() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("realIteratorFoldl.kt")
         public void testRealIteratorFoldl() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("realStringEscape.kt")
         public void testRealStringEscape() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("realStringRepeat.kt")
         public void testRealStringRepeat() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveCallInLambda.kt")
         public void testRecursiveCallInLambda() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveCallInLocalFunction.kt")
         public void testRecursiveCallInLocalFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveInnerFunction.kt")
         public void testRecursiveInnerFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnIf.kt")
         public void testReturnIf() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInCatch.kt")
         public void testReturnInCatch() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInFinally.kt")
         public void testReturnInFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInIfInFinally.kt")
         public void testReturnInIfInFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInParentheses.kt")
         public void testReturnInParentheses() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnInTry.kt")
         public void testReturnInTry() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleBlock.kt")
         public void testSimpleBlock() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleReturn.kt")
         public void testSimpleReturn() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleReturnWithElse.kt")
         public void testSimpleReturnWithElse() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sum.kt")
         public void testSum() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/sum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/sum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tailCallInBlockInParentheses.kt")
         public void testTailCallInBlockInParentheses() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tailCallInParentheses.kt")
         public void testTailCallInParentheses() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tailRecursionInFinally.kt")
         public void testTailRecursionInFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisReferences.kt")
         public void testThisReferences() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unitBlocks.kt")
         public void testUnitBlocks() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenWithCondition.kt")
         public void testWhenWithCondition() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenWithInRange.kt")
         public void testWhenWithInRange() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenWithIs.kt")
         public void testWhenWithIs() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenWithoutCondition.kt")
         public void testWhenWithoutCondition() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class OnObjects extends AbstractJetDiagnosticsTest {
         public void testAllFilesPresentInOnObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -8487,52 +10070,62 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
         
         @TestMetadata("invokeOnClassObject1.kt")
         public void testInvokeOnClassObject1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObject2.kt")
         public void testInvokeOnClassObject2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObjectOfNestedClass1.kt")
         public void testInvokeOnClassObjectOfNestedClass1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObjectOfNestedClass2.kt")
         public void testInvokeOnClassObjectOfNestedClass2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnum1.kt")
         public void testInvokeOnEnum1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnum2.kt")
         public void testInvokeOnEnum2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnImportedEnum1.kt")
         public void testInvokeOnImportedEnum1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnImportedEnum2.kt")
         public void testInvokeOnImportedEnum2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject1.kt")
         public void testInvokeOnObject1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject2.kt")
         public void testInvokeOnObject2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
index 205a0a7c1f3..404cfd0a8ef 100644
--- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.checkers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, JetDiagnosticsTestWithStdLibGenerated.NonLocalReturns.class})
 public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib {
     public void testAllFilesPresentInTestsWithStdLib() throws Exception {
@@ -35,6 +37,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Annotations.AnnotationApplicability.class, Annotations.AnnotationParameterMustBeConstant.class})
     public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInAnnotations() throws Exception {
@@ -43,10 +46,12 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("ClassObjectAnnotatedWithItsClass.kt")
         public void testClassObjectAnnotatedWithItsClass() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AnnotationApplicability extends AbstractJetDiagnosticsTestWithStdLib {
             public void testAllFilesPresentInAnnotationApplicability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -54,17 +59,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("illegalPlatformName.kt")
             public void testIllegalPlatformName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("platformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTestWithStdLib {
             public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -72,22 +80,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("array.kt")
             public void testArray() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classLiteral.kt")
             public void testClassLiteral() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("vararg.kt")
             public void testVararg() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.kt");
+                doTest(fileName);
             }
             
         }
@@ -102,6 +114,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CallableReference.Function.class, CallableReference.Property.class})
     public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInCallableReference() throws Exception {
@@ -110,14 +123,17 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("unused.kt")
         public void testUnused() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Function extends AbstractJetDiagnosticsTestWithStdLib {
             @TestMetadata("abstractClassConstructors.kt")
             public void testAbstractClassConstructors() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInFunction() throws Exception {
@@ -126,256 +142,307 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("ambiguityTopLevelVsTopLevel.kt")
             public void testAmbiguityTopLevelVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callableRefrenceOnNestedObject.kt")
             public void testCallableRefrenceOnNestedObject() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromClass.kt")
             public void testConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromExtension.kt")
             public void testConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromExtensionInClass.kt")
             public void testConstructorFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("constructorFromTopLevel.kt")
             public void testConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageClass.kt")
             public void testDifferentPackageClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageExtension.kt")
             public void testDifferentPackageExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("differentPackageTopLevel.kt")
             public void testDifferentPackageTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("empty.kt")
             public void testEmpty() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromClass.kt")
             public void testExtensionFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromExtension.kt")
             public void testExtensionFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromExtensionInClass.kt")
             public void testExtensionFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromTopLevel.kt")
             public void testExtensionFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionInClassDisallowed.kt")
             public void testExtensionInClassDisallowed() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionOnNullable.kt")
             public void testExtensionOnNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericClassFromTopLevel.kt")
             public void testGenericClassFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("importedInnerConstructor.kt")
             public void testImportedInnerConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromClass.kt")
             public void testInnerConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromExtension.kt")
             public void testInnerConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerConstructorFromTopLevel.kt")
             public void testInnerConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsNotAClass.kt")
             public void testLhsNotAClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructor.kt")
             public void testLocalConstructor() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromExtensionInLocalClass.kt")
             public void testLocalConstructorFromExtensionInLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromLocalClass.kt")
             public void testLocalConstructorFromLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localConstructorFromLocalExtension.kt")
             public void testLocalConstructorFromLocalExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFun.kt")
             public void testLocalNamedFun() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromExtensionInLocalClass.kt")
             public void testLocalNamedFunFromExtensionInLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromLocalClass.kt")
             public void testLocalNamedFunFromLocalClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localNamedFunFromLocalExtension.kt")
             public void testLocalNamedFunFromLocalExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longQualifiedName.kt")
             public void testLongQualifiedName() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longQualifiedNameGeneric.kt")
             public void testLongQualifiedNameGeneric() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromClass.kt")
             public void testMemberFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtension.kt")
             public void testMemberFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtensionInClass.kt")
             public void testMemberFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromTopLevel.kt")
             public void testMemberFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromClass.kt")
             public void testNestedConstructorFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromExtension.kt")
             public void testNestedConstructorFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedConstructorFromTopLevel.kt")
             public void testNestedConstructorFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityLocalVsTopLevel.kt")
             public void testNoAmbiguityLocalVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityMemberVsExtension.kt")
             public void testNoAmbiguityMemberVsExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noAmbiguityMemberVsTopLevel.kt")
             public void testNoAmbiguityMemberVsTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("renameOnImport.kt")
             public void testRenameOnImport() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromClass.kt")
             public void testTopLevelFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromExtension.kt")
             public void testTopLevelFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromExtensionInClass.kt")
             public void testTopLevelFromExtensionInClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevel.kt")
             public void testTopLevelFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unresolved.kt")
             public void testUnresolved() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Property extends AbstractJetDiagnosticsTestWithStdLib {
             @TestMetadata("abstractPropertyViaSubclasses.kt")
             public void testAbstractPropertyViaSubclasses() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("accessViaSubclass.kt")
             public void testAccessViaSubclass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInProperty() throws Exception {
@@ -384,57 +451,68 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
             
             @TestMetadata("classFromClass.kt")
             public void testClassFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromClass.kt")
             public void testExtensionFromClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFromTopLevel.kt")
             public void testExtensionFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionPropertyOnNullable.kt")
             public void testExtensionPropertyOnNullable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericClass.kt")
             public void testGenericClass() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaInstanceField.kt")
             public void testJavaInstanceField() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaStaticFieldViaImport.kt")
             public void testJavaStaticFieldViaImport() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVariable.kt")
             public void testLocalVariable() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromExtension.kt")
             public void testMemberFromExtension() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFromTopLevel.kt")
             public void testMemberFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevel.kt")
             public void testTopLevelFromTopLevel() throws Exception {
-                doTest("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.kt");
+                doTest(fileName);
             }
             
         }
@@ -449,6 +527,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -456,22 +535,26 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("delegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("platformNames.kt")
         public void testPlatformNames() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("platformNamesDuplicate.kt")
         public void testPlatformNamesDuplicate() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FunctionLiterals extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInFunctionLiterals() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -479,12 +562,14 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("pseudocodeMemoryOverhead.kt")
         public void testPseudocodeMemoryOverhead() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinSignature extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInKotlinSignature() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -492,17 +577,20 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("constructorNamedArguments.kt")
         public void testConstructorNamedArguments() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterNames.kt")
         public void testParameterNames() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NonLocalReturns extends AbstractJetDiagnosticsTestWithStdLib {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -510,7 +598,8 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic
         
         @TestMetadata("prohibitNonLocalReturnOutOfTryCatchFinally.kt")
         public void testProhibitNonLocalReturnOutOfTryCatchFinally() throws Exception {
-            doTest("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns/prohibitNonLocalReturnOutOfTryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns/prohibitNonLocalReturnOutOfTryCatchFinally.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
index 4718a89b34a..e22e2da89a5 100644
--- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.cli;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlincExecutableTestGenerated.Jvm.class, KotlincExecutableTestGenerated.Js.class})
 public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest {
     @TestMetadata("compiler/testData/cli/jvm")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Jvm.WrongAbiVersionLib.class})
     public static class Jvm extends AbstractKotlincExecutableTest {
         public void testAllFilesPresentInJvm() throws Exception {
@@ -38,90 +40,108 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
         
         @TestMetadata("classpath.args")
         public void testClasspath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/classpath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("conflictingOverloads.args")
         public void testConflictingOverloads() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/conflictingOverloads.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("diagnosticsOrder.args")
         public void testDiagnosticsOrder() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/diagnosticsOrder.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("duplicateSources.args")
         public void testDuplicateSources() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/duplicateSources.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("duplicateSourcesInModule.args")
         public void testDuplicateSourcesInModule() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("extraHelp.args")
         public void testExtraHelp() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/extraHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("help.args")
         public void testHelp() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/help.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("multipleTextRangesInDiagnosticsOrder.args")
         public void testMultipleTextRangesInDiagnosticsOrder() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("nonExistingClassPathAndAnnotationsPath.args")
         public void testNonExistingClassPathAndAnnotationsPath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("nonExistingSourcePath.args")
         public void testNonExistingSourcePath() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/nonExistingSourcePath.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("signatureClash.args")
         public void testSignatureClash() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/signatureClash.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("simple.args")
         public void testSimple() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/simple.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("suppressAllWarningsJvm.args")
         public void testSuppressAllWarningsJvm() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongAbiVersion.args")
         public void testWrongAbiVersion() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongAbiVersion.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongArgument.args")
         public void testWrongArgument() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongArgument.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongKotlinSignature.args")
         public void testWrongKotlinSignature() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongKotlinSignature.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("wrongScriptWithNoSource.args")
         public void testWrongScriptWithNoSource() throws Exception {
-            doJvmTest("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
+            doJvmTest(fileName);
         }
         
         @TestMetadata("compiler/testData/cli/jvm/wrongAbiVersionLib")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class WrongAbiVersionLib extends AbstractKotlincExecutableTest {
             public void testAllFilesPresentInWrongAbiVersionLib() throws Exception {
@@ -144,6 +164,7 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
     }
     
     @TestMetadata("compiler/testData/cli/js")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Js extends AbstractKotlincExecutableTest {
         public void testAllFilesPresentInJs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), true);
@@ -151,32 +172,38 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
         
         @TestMetadata("jsExtraHelp.args")
         public void testJsExtraHelp() throws Exception {
-            doJsTest("compiler/testData/cli/js/jsExtraHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("jsHelp.args")
         public void testJsHelp() throws Exception {
-            doJsTest("compiler/testData/cli/js/jsHelp.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("outputPostfixFileNotFound.args")
         public void testOutputPostfixFileNotFound() throws Exception {
-            doJsTest("compiler/testData/cli/js/outputPostfixFileNotFound.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("outputPrefixFileNotFound.args")
         public void testOutputPrefixFileNotFound() throws Exception {
-            doJsTest("compiler/testData/cli/js/outputPrefixFileNotFound.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("simple2js.args")
         public void testSimple2js() throws Exception {
-            doJsTest("compiler/testData/cli/js/simple2js.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args");
+            doJsTest(fileName);
         }
         
         @TestMetadata("suppressAllWarningsJS.args")
         public void testSuppressAllWarningsJS() throws Exception {
-            doJsTest("compiler/testData/cli/js/suppressAllWarningsJS.args");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args");
+            doJsTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
index 74b239b41f6..2614f7f6354 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,11 +29,13 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/bytecodeText")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BytecodeTextTestGenerated.BoxingOptimization.class, BytecodeTextTestGenerated.Constants.class, BytecodeTextTestGenerated.DirectInvoke.class, BytecodeTextTestGenerated.Statements.class, BytecodeTextTestGenerated.When.class, BytecodeTextTestGenerated.WhenEnumOptimization.class, BytecodeTextTestGenerated.WhenStringOptimization.class})
 public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
     @TestMetadata("accessorForProtected.kt")
     public void testAccessorForProtected() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/accessorForProtected.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/accessorForProtected.kt");
+        doTest(fileName);
     }
     
     public void testAllFilesPresentInBytecodeText() throws Exception {
@@ -41,120 +44,144 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
     
     @TestMetadata("annotationRetentionPolicyClass.kt")
     public void testAnnotationRetentionPolicyClass() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("annotationRetentionPolicyRuntime.kt")
     public void testAnnotationRetentionPolicyRuntime() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicyRuntime.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("annotationRetentionPolicySource.kt")
     public void testAnnotationRetentionPolicySource() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/annotationRetentionPolicySource.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("bridgeForFakeOverride.kt")
     public void testBridgeForFakeOverride() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/bridgeForFakeOverride.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("componentEvaluatesOnlyOnce.kt")
     public void testComponentEvaluatesOnlyOnce() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/componentEvaluatesOnlyOnce.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("constClosureOptimization.kt")
     public void testConstClosureOptimization() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constClosureOptimization.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("defaultDelegation.kt")
     public void testDefaultDelegation() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/defaultDelegation.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/defaultDelegation.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineFromOtherModule.kt")
     public void testInlineFromOtherModule() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inlineFromOtherModule.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNotNull.kt")
     public void testIntConstantNotNull() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNotNull.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNullable.kt")
     public void testIntConstantNullable() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantNullableSafeCall.kt")
     public void testIntConstantNullableSafeCall() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantNullableSafeCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("intConstantSafeCall.kt")
     public void testIntConstantSafeCall() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/intConstantSafeCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt2202.kt")
     public void testKt2202() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt2202.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2202.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt2887.kt")
     public void testKt2887() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt2887.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt2887.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt3845.kt")
     public void testKt3845() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt3845.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt3845.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016.kt")
     public void testKt5016() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016int.kt")
     public void testKt5016int() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("kt5016intOrNull.kt")
     public void testKt5016intOrNull() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/kt5016intOrNull.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noFlagAnnotations.kt")
     public void testNoFlagAnnotations() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noFlagAnnotations.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noWrapperForMethodReturningPrimitive.kt")
     public void testNoWrapperForMethodReturningPrimitive() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/noWrapperForMethodReturningPrimitive.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateDefaultArgs.kt")
     public void testPrivateDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/privateDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunWithDefaultArgs.kt")
     public void testTopLevelFunWithDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/topLevelFunWithDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("traitImplGeneratedOnce.kt")
     public void testTraitImplGeneratedOnce() throws Exception {
-        doTest("compiler/testData/codegen/bytecodeText/traitImplGeneratedOnce.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/traitImplGeneratedOnce.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BoxingOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInBoxingOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -162,62 +189,74 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("casts.kt")
         public void testCasts() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("checkcastAndInstanceOf.kt")
         public void testCheckcastAndInstanceOf() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/checkcastAndInstanceOf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fold.kt")
         public void testFold() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/fold.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullCheck.kt")
         public void testNullCheck() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/nullCheck.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("progressions.kt")
         public void testProgressions() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("safeCallWithElvis.kt")
         public void testSafeCallWithElvis() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/safeCallWithElvis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("severalInlines.kt")
         public void testSeveralInlines() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/severalInlines.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unsafeRemoving.kt")
         public void testUnsafeRemoving() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/unsafeRemoving.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variableClash.kt")
         public void testVariableClash() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variableClash.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variables.kt")
         public void testVariables() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization/variables.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/constants")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constants extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInConstants() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/constants"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -225,22 +264,26 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("byte.kt")
         public void testByte() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/byte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/byte.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableByteAndShort.kt")
         public void testNullableByteAndShort() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/nullableByteAndShort.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("short.kt")
         public void testShort() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/constants/short.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/constants/short.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/directInvoke")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DirectInvoke extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInDirectInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/directInvoke"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -248,22 +291,26 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("callableReference.kt")
         public void testCallableReference() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/callableReference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inplaceClosure.kt")
         public void testInplaceClosure() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/inplaceClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFun.kt")
         public void testLocalFun() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/directInvoke/localFun.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/statements")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Statements extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInStatements() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/statements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -271,37 +318,44 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("ifSingleBranch.kt")
         public void testIfSingleBranch() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifSingleBranch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifThenElse.kt")
         public void testIfThenElse() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifThenElseEmpty.kt")
         public void testIfThenElseEmpty() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/ifThenElseEmpty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryCatchFinally.kt")
         public void testTryCatchFinally() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/tryCatchFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("when.kt")
         public void testWhen() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/when.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/when.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenSubject.kt")
         public void testWhenSubject() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/statements/whenSubject.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -309,12 +363,14 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("integralWhenWithNoInlinedConstants.kt")
         public void testIntegralWhenWithNoInlinedConstants() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/when/integralWhenWithNoInlinedConstants.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenEnumOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhenEnumOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -322,52 +378,62 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("bigEnum.kt")
         public void testBigEnum() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/bigEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/duplicatingItems.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/expression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralInTopLevel.kt")
         public void testFunctionLiteralInTopLevel() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("manyWhensWithinClass.kt")
         public void testManyWhensWithinClass() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/manyWhensWithinClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonConstantEnum.kt")
         public void testNonConstantEnum() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nonConstantEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("subjectAny.kt")
         public void testSubjectAny() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/subjectAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("withoutElse.kt")
         public void testWithoutElse() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization/withoutElse.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenStringOptimization extends AbstractBytecodeTextTest {
         public void testAllFilesPresentInWhenStringOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -375,42 +441,50 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
         
         @TestMetadata("denseHashCode.kt")
         public void testDenseHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/denseHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItems.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("duplicatingItemsSameHashCode.kt")
         public void testDuplicatingItemsSameHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/expression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonInlinedConst.kt")
         public void testNonInlinedConst() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nonInlinedConst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sameHashCode.kt")
         public void testSameHashCode() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/sameHashCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("statement.kt")
         public void testStatement() throws Exception {
-            doTest("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization/statement.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java
index 55398dbe94d..27f444fa31a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/checkLocalVariablesTable")
+@TestDataPath("$PROJECT_ROOT")
 public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest {
     public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,52 +37,62 @@ public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVar
     
     @TestMetadata("catchClause.kt")
     public void testCatchClause() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/catchClause.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/catchClause.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("copyFunction.kt")
     public void testCopyFunction() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/copyFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/copyFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineLambdaWithItParam.kt")
     public void testInlineLambdaWithItParam() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithItParam.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineLambdaWithParam.kt")
     public void testInlineLambdaWithParam() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineLambdaWithParam.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineSimple.kt")
     public void testInlineSimple() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimple.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inlineSimpleChain.kt")
     public void testInlineSimpleChain() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/inlineSimpleChain.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("itInLambda.kt")
     public void testItInLambda() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/itInLambda.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInLambda.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("itInReturnedLambda.kt")
     public void testItInReturnedLambda() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/itInReturnedLambda.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("lambdaAsVar.kt")
     public void testLambdaAsVar() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/lambdaAsVar.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localFun.kt")
     public void testLocalFun() throws Exception {
-        doTest("compiler/testData/checkLocalVariablesTable/localFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/checkLocalVariablesTable/localFun.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java
index 43250f91cca..d3eac9c183a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/script")
+@TestDataPath("$PROJECT_ROOT")
 public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
     public void testAllFilesPresentInScript() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true);
@@ -35,72 +37,86 @@ public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
     
     @TestMetadata("empty.kts")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/codegen/script/empty.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/empty.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("helloWorld.kts")
     public void testHelloWorld() throws Exception {
-        doTest("compiler/testData/codegen/script/helloWorld.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/helloWorld.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameter.kts")
     public void testParameter() throws Exception {
-        doTest("compiler/testData/codegen/script/parameter.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameter.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterArray.kts")
     public void testParameterArray() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterArray.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterArray.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterClosure.kts")
     public void testParameterClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("parameterLong.kts")
     public void testParameterLong() throws Exception {
-        doTest("compiler/testData/codegen/script/parameterLong.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/parameterLong.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelFunction.kts")
     public void testSecondLevelFunction() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelFunction.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunction.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelFunctionClosure.kts")
     public void testSecondLevelFunctionClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelFunctionClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelFunctionClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("secondLevelVal.kts")
     public void testSecondLevelVal() throws Exception {
-        doTest("compiler/testData/codegen/script/secondLevelVal.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/secondLevelVal.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleClass.kts")
     public void testSimpleClass() throws Exception {
-        doTest("compiler/testData/codegen/script/simpleClass.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/simpleClass.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("string.kts")
     public void testString() throws Exception {
-        doTest("compiler/testData/codegen/script/string.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/string.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunction.kts")
     public void testTopLevelFunction() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelFunction.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunction.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelFunctionClosure.kts")
     public void testTopLevelFunctionClosure() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelFunctionClosure.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelFunctionClosure.kts");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelProperty.kts")
     public void testTopLevelProperty() throws Exception {
-        doTest("compiler/testData/codegen/script/topLevelProperty.kts");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelProperty.kts");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
index ba70b2a3048..6bad2d2c5a2 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/topLevelMemberInvocation")
+@TestDataPath("$PROJECT_ROOT")
 public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest {
     public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,37 +37,44 @@ public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMemb
     
     @TestMetadata("extensionFunction")
     public void testExtensionFunction() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/extensionFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionDifferentPackage")
     public void testFunctionDifferentPackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionDifferentPackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionInMultiFilePackage")
     public void testFunctionInMultiFilePackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionInMultiFilePackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("functionSamePackage")
     public void testFunctionSamePackage() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/functionSamePackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("property")
     public void testProperty() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/property/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/property/");
+        doTest(fileName);
     }
     
     @TestMetadata("propertyWithGetter")
     public void testPropertyWithGetter() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/propertyWithGetter/");
+        doTest(fileName);
     }
     
     @TestMetadata("twoModules")
     public void testTwoModules() throws Exception {
-        doTest("compiler/testData/codegen/topLevelMemberInvocation/twoModules/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/topLevelMemberInvocation/twoModules/");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
index c9ac5e0862e..d51abde028d 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.defaultConstructor;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/defaultArguments/reflection")
+@TestDataPath("$PROJECT_ROOT")
 public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgumentsReflectionTest {
     public void testAllFilesPresentInReflection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,62 +37,74 @@ public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgu
     
     @TestMetadata("classInClassObject.kt")
     public void testClassInClassObject() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classInObject.kt")
     public void testClassInObject() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classInObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classWithTwoDefaultArgs.kt")
     public void testClassWithTwoDefaultArgs() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithTwoDefaultArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("classWithVararg.kt")
     public void testClassWithVararg() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/classWithVararg.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/enum.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/enum.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("internalClass.kt")
     public void testInternalClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/internalClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateClass.kt")
     public void testPrivateClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("privateConstructor.kt")
     public void testPrivateConstructor() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/privateConstructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicClass.kt")
     public void testPublicClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicClassWoDefArgs.kt")
     public void testPublicClassWoDefArgs() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicClassWoDefArgs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicInnerClass.kt")
     public void testPublicInnerClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("publicInnerClassInPrivateClass.kt")
     public void testPublicInnerClassInPrivateClass() throws Exception {
-        doTest("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/defaultArguments/reflection/publicInnerClassInPrivateClass.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java
index 16dba5dfb83..9049d84881b 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.flags;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/writeFlags")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({WriteFlagsTestGenerated.Class.class, WriteFlagsTestGenerated.Function.class, WriteFlagsTestGenerated.InnerClass.class, WriteFlagsTestGenerated.Property.class})
 public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     public void testAllFilesPresentInWriteFlags() throws Exception {
@@ -35,6 +37,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/class")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Class.AccessFlags.class, Class.DeprecatedFlag.class, Class.Visibility.class})
     public static class Class extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInClass() throws Exception {
@@ -42,6 +45,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/accessFlags")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AccessFlags extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInAccessFlags() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/accessFlags"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -49,32 +53,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("objectLiteral.kt")
             public void testObjectLiteral() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/objectLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicFinalClass.kt")
             public void testPublicFinalClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicFinalInnerClass.kt")
             public void testPublicFinalInnerClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicFinalInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicInnerInterface.kt")
             public void testPublicInnerInterface() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInnerInterface.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicInterface.kt")
             public void testPublicInterface() throws Exception {
-                doTest("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/accessFlags/publicInterface.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -82,32 +92,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("class.kt")
             public void testClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumClass.kt")
             public void testEnumClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/enumClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerClass.kt")
             public void testInnerClass() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/innerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                doTest("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/deprecatedFlag/trait.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/class/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Visibility.Internal.class, Visibility.Private.class, Visibility.Public.class})
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
@@ -115,6 +131,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/internal")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Internal extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInInternal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -122,47 +139,56 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/internal/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/internal/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/private")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Private extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInPrivate() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -170,47 +196,56 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/private/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/private/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/class/visibility/public")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Public extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInPublic() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -218,42 +253,50 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("enum.kt")
                 public void testEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/enum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/enum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerClass.kt")
                 public void testInnerClass() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerEnum.kt")
                 public void testInnerEnum() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerEnum.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerObject.kt")
                 public void testInnerObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("innerTrait.kt")
                 public void testInnerTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/innerTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("object.kt")
                 public void testObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/object.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/object.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/writeFlags/class/visibility/public/trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/class/visibility/public/trait.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -279,6 +322,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/function")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Function.ClassObjectPrivate.class, Function.Constructors.class, Function.DeprecatedFlag.class})
     public static class Function extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInFunction() throws Exception {
@@ -286,6 +330,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/classObjectPrivate")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassObjectPrivate extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInClassObjectPrivate() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/classObjectPrivate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -293,22 +338,26 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("privateFun.kt")
             public void testPrivateFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateVal.kt")
             public void testPrivateVal() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateVar.kt")
             public void testPrivateVar() throws Exception {
-                doTest("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/constructors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Constructors extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInConstructors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/constructors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -316,27 +365,32 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectInClass.kt")
             public void testObjectInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/objectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectLiteral.kt")
             public void testObjectLiteral() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/objectLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/objectLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelObject.kt")
             public void testTopLevelObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/constructors/topLevelObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/constructors/topLevelObject.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/function/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -344,62 +398,74 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("emptyGetter.kt")
             public void testEmptyGetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptyGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptySetter.kt")
             public void testEmptySetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/emptySetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFun.kt")
             public void testExtentionFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/extentionFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funInClass.kt")
             public void testFunInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funInClassObject.kt")
             public void testFunInClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/funInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getter.kt")
             public void testGetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getterAnnotationOnProperty.kt")
             public void testGetterAnnotationOnProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterAnnotationOnProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getterForPropertyInConstructor.kt")
             public void testGetterForPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/getterForPropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setter.kt")
             public void testSetter() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterAnnotationOnProperty.kt")
             public void testSetterAnnotationOnProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterAnnotationOnProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("setterForPropertyInConstructor.kt")
             public void testSetterForPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/setterForPropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFun.kt")
             public void testTopLevelFun() throws Exception {
-                doTest("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/function/deprecatedFlag/topLevelFun.kt");
+                doTest(fileName);
             }
             
         }
@@ -415,6 +481,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/innerClass")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({InnerClass.Visibility.class})
     public static class InnerClass extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInInnerClass() throws Exception {
@@ -422,6 +489,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/innerClass/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -429,32 +497,38 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("internalClassObject.kt")
             public void testInternalClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/internalClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/private.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/private.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("privateClassObject.kt")
             public void testPrivateClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/privateClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("public.kt")
             public void testPublic() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/public.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/public.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("publicClassObject.kt")
             public void testPublicClassObject() throws Exception {
-                doTest("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/innerClass/visibility/publicClassObject.kt");
+                doTest(fileName);
             }
             
         }
@@ -468,6 +542,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
     }
     
     @TestMetadata("compiler/testData/writeFlags/property")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Property.ClassObject.class, Property.DeprecatedFlag.class, Property.Visibility.class})
     public static class Property extends AbstractWriteFlagsTest {
         public void testAllFilesPresentInProperty() throws Exception {
@@ -475,6 +550,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/classObject")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ClassObject.Class.class, ClassObject.Rename.class, ClassObject.Trait.class})
         public static class ClassObject extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInClassObject() throws Exception {
@@ -482,6 +558,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/class")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Class extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -489,92 +566,110 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("delegatedProtectedVar.kt")
                 public void testDelegatedProtectedVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedProtectedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedPublicVal.kt")
                 public void testDelegatedPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/delegatedPublicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVal.kt")
                 public void testInternalVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVar.kt")
                 public void testInternalVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVarPrivateSet.kt")
                 public void testInternalVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/internalVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noBackingField.kt")
                 public void testNoBackingField() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/noBackingField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVal.kt")
                 public void testPrivateVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/privateVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVar.kt")
                 public void testPrivateVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/privateVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/privateVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVal.kt")
                 public void testProtectedVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVarPrivateSet.kt")
                 public void testProtectedVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/protectedVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVal.kt")
                 public void testPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicValNonDefault.kt")
                 public void testPublicValNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicValNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVar.kt")
                 public void testPublicVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarNonDefault.kt")
                 public void testPublicVarNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPrivateSet.kt")
                 public void testPublicVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarProtectedSet.kt")
                 public void testPublicVarProtectedSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarProtectedSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPublicSet.kt")
                 public void testPublicVarPublicSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/class/publicVarPublicSet.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/rename")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Rename extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInRename() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -582,27 +677,32 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("constructorAndClassObject.kt")
                 public void testConstructorAndClassObject() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/constructorAndClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedAndDelegated.kt")
                 public void testDelegatedAndDelegated() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndDelegated.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedAndProperty.kt")
                 public void testDelegatedAndProperty() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/delegatedAndProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("propertyAndProperty.kt")
                 public void testPropertyAndProperty() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/rename/propertyAndProperty.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/writeFlags/property/classObject/trait")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Trait extends AbstractWriteFlagsTest {
                 public void testAllFilesPresentInTrait() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/trait"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -610,87 +710,104 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 
                 @TestMetadata("delegatedProtectedVar.kt")
                 public void testDelegatedProtectedVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedProtectedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("delegatedPublicVal.kt")
                 public void testDelegatedPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/delegatedPublicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVal.kt")
                 public void testInternalVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVar.kt")
                 public void testInternalVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("internalVarPrivateSet.kt")
                 public void testInternalVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("noBackingField.kt")
                 public void testNoBackingField() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/noBackingField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVal.kt")
                 public void testPrivateVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("privateVar.kt")
                 public void testPrivateVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/privateVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVal.kt")
                 public void testProtectedVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("protectedVarPrivateSet.kt")
                 public void testProtectedVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/protectedVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVal.kt")
                 public void testPublicVal() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicValNonDefault.kt")
                 public void testPublicValNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicValNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVar.kt")
                 public void testPublicVar() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarNonDefault.kt")
                 public void testPublicVarNonDefault() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarNonDefault.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPrivateSet.kt")
                 public void testPublicVarPrivateSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPrivateSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarProtectedSet.kt")
                 public void testPublicVarProtectedSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarProtectedSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("publicVarPublicSet.kt")
                 public void testPublicVarPublicSet() throws Exception {
-                    doTest("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/classObject/trait/publicVarPublicSet.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -706,6 +823,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/deprecatedFlag")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeprecatedFlag extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInDeprecatedFlag() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -713,17 +831,20 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("propertyInClass.kt")
             public void testPropertyInClass() throws Exception {
-                doTest("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/propertyInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelProperty.kt")
             public void testTopLevelProperty() throws Exception {
-                doTest("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/deprecatedFlag/topLevelProperty.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/writeFlags/property/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractWriteFlagsTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -731,17 +852,20 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/private.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/private.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("public.kt")
             public void testPublic() throws Exception {
-                doTest("compiler/testData/writeFlags/property/visibility/public.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeFlags/property/visibility/public.kt");
+                doTest(fileName);
             }
             
         }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
index b863d74c4e1..b577d35ad6f 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxAgainstJava")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxAgainstJavaCodegenTestGenerated.Annotations.class, BlackBoxAgainstJavaCodegenTestGenerated.CallableReference.class, BlackBoxAgainstJavaCodegenTestGenerated.Constructor.class, BlackBoxAgainstJavaCodegenTestGenerated.Delegation.class, BlackBoxAgainstJavaCodegenTestGenerated.Enum.class, BlackBoxAgainstJavaCodegenTestGenerated.Functions.class, BlackBoxAgainstJavaCodegenTestGenerated.InnerClass.class, BlackBoxAgainstJavaCodegenTestGenerated.Property.class, BlackBoxAgainstJavaCodegenTestGenerated.Reflection.class, BlackBoxAgainstJavaCodegenTestGenerated.Sam.class, BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class, BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class})
 public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxAgainstJava() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Annotations extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,37 +45,44 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("javaAnnotationCall.kt")
         public void testJavaAnnotationCall() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaAnnotationDefault.kt")
         public void testJavaAnnotationDefault() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaNegativePropertyAsAnnotationParameter.kt")
         public void testJavaNegativePropertyAsAnnotationParameter() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaPropertyAsAnnotationParameter.kt")
         public void testJavaPropertyAsAnnotationParameter() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("javaPropertyWithIntInitializer.kt")
         public void testJavaPropertyWithIntInitializer() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("retentionInJava.kt")
         public void testRetentionInJava() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CallableReference extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCallableReference() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,22 +90,26 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("constructor.kt")
         public void testConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("publicFinalField.kt")
         public void testPublicFinalField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicFinalField.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("publicMutableField.kt")
         public void testPublicMutableField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/callableReference/publicMutableField.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructor extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -103,12 +117,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("genericConstructor.kt")
         public void testGenericConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/delegation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Delegation extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDelegation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -116,12 +132,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("delegationAndInheritanceFromJava.kt")
         public void testDelegationAndInheritanceFromJava() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/enum")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Enum extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -129,37 +147,44 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("simpleJavaEnum.kt")
         public void testSimpleJavaEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaEnumWithFunction.kt")
         public void testSimpleJavaEnumWithFunction() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaEnumWithStaticImport.kt")
         public void testSimpleJavaEnumWithStaticImport() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("simpleJavaInnerEnum.kt")
         public void testSimpleJavaInnerEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("staticField.kt")
         public void testStaticField() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("staticMethod.kt")
         public void testStaticMethod() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/functions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Functions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFunctions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -167,32 +192,38 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("constructor.kt")
         public void testConstructor() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("max.kt")
         public void testMax() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/max.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/max.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("referencesStaticInnerClassMethod.kt")
         public void testReferencesStaticInnerClassMethod() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("referencesStaticInnerClassMethodL2.kt")
         public void testReferencesStaticInnerClassMethodL2() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("unrelatedUpperBounds.kt")
         public void testUnrelatedUpperBounds() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/innerClass")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InnerClass extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInInnerClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -200,22 +231,26 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("kt3532.kt")
         public void testKt3532() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("kt3812.kt")
         public void testKt3812() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("kt4036.kt")
         public void testKt4036() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/property")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Property extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -223,17 +258,20 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt")
         public void testFieldAccessFromExtensionInTraitImpl() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("fieldAccessViaSubclass.kt")
         public void testFieldAccessViaSubclass() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Reflection.Mapping.class})
     public static class Reflection extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInReflection() throws Exception {
@@ -241,6 +279,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Mapping extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInMapping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -248,12 +287,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("jClass2kClass.kt")
             public void testJClass2kClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/jClass2kClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("javaFields.kt")
             public void testJavaFields() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping/javaFields.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
@@ -267,6 +308,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Sam.Adapters.class})
     public static class Sam extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSam() throws Exception {
@@ -275,15 +317,18 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("differentFqNames.kt")
         public void testDifferentFqNames() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("samConstructorGenericSignature.kt")
         public void testSamConstructorGenericSignature() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt");
+            doTestAgainstJava(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Adapters.Operators.class})
         public static class Adapters extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInAdapters() throws Exception {
@@ -292,105 +337,126 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("callAbstractAdapter.kt")
             public void testCallAbstractAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("comparator.kt")
             public void testComparator() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("constructor.kt")
             public void testConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("fileFilter.kt")
             public void testFileFilter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("genericSignature.kt")
             public void testGenericSignature() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("implementAdapter.kt")
             public void testImplementAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedInKotlin.kt")
             public void testInheritedInKotlin() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedOverriddenAdapter.kt")
             public void testInheritedOverriddenAdapter() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("inheritedSimple.kt")
             public void testInheritedSimple() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralAndLiteralRunnable.kt")
             public void testNonLiteralAndLiteralRunnable() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralComparator.kt")
             public void testNonLiteralComparator() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralInConstructor.kt")
             public void testNonLiteralInConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralNull.kt")
             public void testNonLiteralNull() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("nonLiteralRunnable.kt")
             public void testNonLiteralRunnable() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("severalSamParameters.kt")
             public void testSeveralSamParameters() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simplest.kt")
             public void testSimplest() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("superconstructor.kt")
             public void testSuperconstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfClass.kt")
             public void testTypeParameterOfClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfMethod.kt")
             public void testTypeParameterOfMethod() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("typeParameterOfOuterClass.kt")
             public void testTypeParameterOfOuterClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Operators extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInOperators() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -398,62 +464,74 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
                 
                 @TestMetadata("augmentedAssignmentAndSquareBrackets.kt")
                 public void testAugmentedAssignmentAndSquareBrackets() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("augmentedAssignmentPure.kt")
                 public void testAugmentedAssignmentPure() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("augmentedAssignmentViaSimpleBinary.kt")
                 public void testAugmentedAssignmentViaSimpleBinary() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("binary.kt")
                 public void testBinary() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("compareTo.kt")
                 public void testCompareTo() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("contains.kt")
                 public void testContains() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("get.kt")
                 public void testGet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("infixCall.kt")
                 public void testInfixCall() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("invoke.kt")
                 public void testInvoke() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("multiGetSet.kt")
                 public void testMultiGetSet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("multiInvoke.kt")
                 public void testMultiInvoke() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
                 @TestMetadata("set.kt")
                 public void testSet() throws Exception {
-                    doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt");
+                    doTestAgainstJava(fileName);
                 }
                 
             }
@@ -475,6 +553,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/staticFun")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StaticFun extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInStaticFun() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -482,12 +561,14 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         
         @TestMetadata("classWithNestedEnum.kt")
         public void testClassWithNestedEnum() throws Exception {
-            doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt");
+            doTestAgainstJava(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Visibility.Package.class, Visibility.ProtectedAndPackage.class, Visibility.ProtectedStatic.class})
     public static class Visibility extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInVisibility() throws Exception {
@@ -495,6 +576,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Package extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInPackage() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -502,27 +584,32 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("kt2781.kt")
             public void testKt2781() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageClass.kt")
             public void testPackageClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageFun.kt")
             public void testPackageFun() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("packageProperty.kt")
             public void testPackageProperty() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInProtectedAndPackage() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -530,27 +617,32 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("overrideProtectedFunInPackage.kt")
             public void testOverrideProtectedFunInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedFunInPackage.kt")
             public void testProtectedFunInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedPropertyInPackage.kt")
             public void testProtectedPropertyInPackage() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("protectedStaticClass.kt")
             public void testProtectedStaticClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedStatic extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInProtectedStatic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -558,62 +650,74 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod
             
             @TestMetadata("funCallInConstructor.kt")
             public void testFunCallInConstructor() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funClassObject.kt")
             public void testFunClassObject() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funGenericClass.kt")
             public void testFunGenericClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticClass.kt")
             public void testFunNestedStaticClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticClass2.kt")
             public void testFunNestedStaticClass2() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNestedStaticGenericClass.kt")
             public void testFunNestedStaticGenericClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funNotDirectSuperClass.kt")
             public void testFunNotDirectSuperClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("funObject.kt")
             public void testFunObject() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleClass.kt")
             public void testSimpleClass() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleClass2.kt")
             public void testSimpleClass2() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleFun.kt")
             public void testSimpleFun() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt");
+                doTestAgainstJava(fileName);
             }
             
             @TestMetadata("simpleProperty.kt")
             public void testSimpleProperty() throws Exception {
-                doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt");
+                doTestAgainstJava(fileName);
             }
             
         }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
index ee6eb1c38a7..77e190e5afc 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/box")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.JavaInterop.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.Package.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.Regressions.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.SuperConstructorCall.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class})
 public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBox() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/arrays")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Arrays extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInArrays() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,197 +45,236 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("arrayGetAssignMultiIndex.kt")
         public void testArrayGetAssignMultiIndex() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetAssignMultiIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayGetMultiIndex.kt")
         public void testArrayGetMultiIndex() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayGetMultiIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayPlusAssign.kt")
         public void testArrayPlusAssign() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/arrayPlusAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("collectionAssignGetMultiIndex.kt")
         public void testCollectionAssignGetMultiIndex() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionAssignGetMultiIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("collectionGetMultiIndex.kt")
         public void testCollectionGetMultiIndex() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/collectionGetMultiIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachBooleanArray.kt")
         public void testForEachBooleanArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachBooleanArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachBooleanArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachByteArray.kt")
         public void testForEachByteArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachByteArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachByteArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachCharArray.kt")
         public void testForEachCharArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachCharArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachCharArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachDoubleArray.kt")
         public void testForEachDoubleArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachDoubleArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachDoubleArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachFloatArray.kt")
         public void testForEachFloatArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachFloatArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachFloatArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachIntArray.kt")
         public void testForEachIntArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachLongArray.kt")
         public void testForEachLongArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachLongArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachLongArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forEachShortArray.kt")
         public void testForEachShortArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/forEachShortArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/forEachShortArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/hashMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/hashMap.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("indices.kt")
         public void testIndices() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/indices.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/indices.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("indicesChar.kt")
         public void testIndicesChar() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/indicesChar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/indicesChar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iterator.kt")
         public void testIterator() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iterator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iterator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorBooleanArray.kt")
         public void testIteratorBooleanArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorBooleanArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorByteArray.kt")
         public void testIteratorByteArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorByteArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorByteArrayNextByte.kt")
         public void testIteratorByteArrayNextByte() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorByteArrayNextByte.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorCharArray.kt")
         public void testIteratorCharArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorCharArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorCharArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorDoubleArray.kt")
         public void testIteratorDoubleArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorDoubleArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorFloatArray.kt")
         public void testIteratorFloatArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorFloatArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorFloatArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorIntArray.kt")
         public void testIteratorIntArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorLongArray.kt")
         public void testIteratorLongArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorLongArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorLongArrayNextLong.kt")
         public void testIteratorLongArrayNextLong() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorLongArrayNextLong.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iteratorShortArray.kt")
         public void testIteratorShortArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/iteratorShortArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/iteratorShortArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt238.kt")
         public void testKt238() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt238.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt238.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2997.kt")
         public void testKt2997() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt2997.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt2997.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt33.kt")
         public void testKt33() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt33.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt33.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4348.kt")
         public void testKt4348() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt4348.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt4348.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt503.kt")
         public void testKt503() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt503.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt503.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt594.kt")
         public void testKt594() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt594.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt594.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt602.kt")
         public void testKt602() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt602.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt602.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt779.kt")
         public void testKt779() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt779.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt779.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt950.kt")
         public void testKt950() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/kt950.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/kt950.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longAsIndex.kt")
         public void testLongAsIndex() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/longAsIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/longAsIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonNullArray.kt")
         public void testNonNullArray() throws Exception {
-            doTest("compiler/testData/codegen/box/arrays/nonNullArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/arrays/nonNullArray.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/binaryOp")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BinaryOp extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBinaryOp() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/binaryOp"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -240,42 +282,50 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("call.kt")
         public void testCall() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/call.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/call.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callNullable.kt")
         public void testCallNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/callNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/callNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCall.kt")
         public void testInfixCall() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/infixCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCallNullable.kt")
         public void testInfixCallNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/infixCallNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/infixCallNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrinsic.kt")
         public void testIntrinsic() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/intrinsic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrinsicNullable.kt")
         public void testIntrinsicNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longOverflow.kt")
         public void testLongOverflow() throws Exception {
-            doTest("compiler/testData/codegen/box/binaryOp/longOverflow.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/binaryOp/longOverflow.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/bridges")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Bridges.SubstitutionInSuperClass.class})
     public static class Bridges extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBridges() throws Exception {
@@ -284,219 +334,263 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("complexMultiInheritance.kt")
         public void testComplexMultiInheritance() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexMultiInheritance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("complexTraitImpl.kt")
         public void testComplexTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/complexTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/complexTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegation.kt")
         public void testDelegation() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/delegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationProperty.kt")
         public void testDelegationProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/delegationProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/delegationProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("diamond.kt")
         public void testDiamond() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/diamond.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/diamond.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeCovariantOverride.kt")
         public void testFakeCovariantOverride() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeCovariantOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeGenericCovariantOverride.kt")
         public void testFakeGenericCovariantOverride() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeGenericCovariantOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideInTraitWithRequiredFromTraitImpl.kt")
         public void testFakeOverrideInTraitWithRequiredFromTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideInTraitWithRequiredFromTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideInTraitWithRequiredFromTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideOfPropertySetterInTraitImpl.kt")
         public void testFakeOverrideOfPropertySetterInTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideOfPropertySetterInTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfPropertySetterInTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideOfTraitImpl.kt")
         public void testFakeOverrideOfTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideOfTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideWithImplementationInTrait.kt")
         public void testFakeOverrideWithImplementationInTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideWithImplementationInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithImplementationInTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideWithSeveralSuperDeclarations.kt")
         public void testFakeOverrideWithSeveralSuperDeclarations() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSeveralSuperDeclarations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeOverrideWithSynthesizedImplementation.kt")
         public void testFakeOverrideWithSynthesizedImplementation() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/fakeOverrideWithSynthesizedImplementation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1939.kt")
         public void testKt1939() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt1939.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1939.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1959.kt")
         public void testKt1959() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt1959.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt1959.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2498.kt")
         public void testKt2498() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt2498.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2498.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2702.kt")
         public void testKt2702() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt2702.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2702.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2833.kt")
         public void testKt2833() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt2833.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2833.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2920.kt")
         public void testKt2920() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt2920.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt2920.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt318.kt")
         public void testKt318() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/kt318.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/kt318.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longChainOneBridge.kt")
         public void testLongChainOneBridge() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/longChainOneBridge.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("manyTypeArgumentsSubstitutedSuccessively.kt")
         public void testManyTypeArgumentsSubstitutedSuccessively() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/manyTypeArgumentsSubstitutedSuccessively.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("methodFromTrait.kt")
         public void testMethodFromTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/methodFromTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noBridgeOnMutableCollectionInheritance.kt")
         public void testNoBridgeOnMutableCollectionInheritance() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/noBridgeOnMutableCollectionInheritance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectClone.kt")
         public void testObjectClone() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/objectClone.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/objectClone.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideAbstractProperty.kt")
         public void testOverrideAbstractProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideAbstractProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideReturnType.kt")
         public void testOverrideReturnType() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/overrideReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/overrideReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorsWithoutBody.kt")
         public void testPropertyAccessorsWithoutBody() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyAccessorsWithoutBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyDiamond.kt")
         public void testPropertyDiamond() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/propertyDiamond.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyDiamond.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyInConstructor.kt")
         public void testPropertyInConstructor() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/propertyInConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertyInConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertySetter.kt")
         public void testPropertySetter() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/propertySetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/propertySetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleEnum.kt")
         public void testSimpleEnum() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleGenericMethod.kt")
         public void testSimpleGenericMethod() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleGenericMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleObject.kt")
         public void testSimpleObject() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleReturnType.kt")
         public void testSimpleReturnType() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleTraitImpl.kt")
         public void testSimpleTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleUpperBound.kt")
         public void testSimpleUpperBound() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/simpleUpperBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/simpleUpperBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("traitImplInheritsTraitImpl.kt")
         public void testTraitImplInheritsTraitImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitImplInheritsTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("traitWithRequiredCovariantOverride.kt")
         public void testTraitWithRequiredCovariantOverride() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/traitWithRequiredCovariantOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/traitWithRequiredCovariantOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("twoParentsWithDifferentMethodsTwoBridges.kt")
         public void testTwoParentsWithDifferentMethodsTwoBridges() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithDifferentMethodsTwoBridges.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("twoParentsWithTheSameMethodOneBridge.kt")
         public void testTwoParentsWithTheSameMethodOneBridge() throws Exception {
-            doTest("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/twoParentsWithTheSameMethodOneBridge.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SubstitutionInSuperClass extends AbstractBlackBoxCodegenTest {
             @TestMetadata("abstractFun.kt")
             public void testAbstractFun() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/abstractFun.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInSubstitutionInSuperClass() throws Exception {
@@ -505,42 +599,50 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("boundedTypeArguments.kt")
             public void testBoundedTypeArguments() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/boundedTypeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("delegation.kt")
             public void testDelegation() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/enum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericMethod.kt")
             public void testGenericMethod() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/genericMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("object.kt")
             public void testObject() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/object.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("property.kt")
             public void testProperty() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/property.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("upperBound.kt")
             public void testUpperBound() throws Exception {
-                doTest("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass/upperBound.kt");
+                doTest(fileName);
             }
             
         }
@@ -554,6 +656,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBuiltinStubMethods() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -561,67 +664,80 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("Collection.kt")
         public void testCollection() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/Collection.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Collection.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("dontGenerateBodyInTrait.kt")
         public void testDontGenerateBodyInTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/dontGenerateBodyInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/dontGenerateBodyInTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Iterator.kt")
         public void testIterator() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/Iterator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Iterator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IteratorWithRemove.kt")
         public void testIteratorWithRemove() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/IteratorWithRemove.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/IteratorWithRemove.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("List.kt")
         public void testList() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/List.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/List.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListWithAllImplementations.kt")
         public void testListWithAllImplementations() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/ListWithAllImplementations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllImplementations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListWithAllInheritedImplementations.kt")
         public void testListWithAllInheritedImplementations() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/ListWithAllInheritedImplementations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/ListWithAllInheritedImplementations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Map.kt")
         public void testMap() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/Map.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/Map.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapEntry.kt")
         public void testMapEntry() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/MapEntry.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntry.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapEntryWithSetValue.kt")
         public void testMapEntryWithSetValue() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/MapEntryWithSetValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapEntryWithSetValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapWithAllImplementations.kt")
         public void testMapWithAllImplementations() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/MapWithAllImplementations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SubstitutedList.kt")
         public void testSubstitutedList() throws Exception {
-            doTest("compiler/testData/codegen/box/builtinStubMethods/SubstitutedList.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/SubstitutedList.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/casts")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Casts extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCasts() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/casts"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -629,47 +745,56 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("as.kt")
         public void testAs() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/as.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/as.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("asForConstants.kt")
         public void testAsForConstants() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/asForConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asForConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("asSafe.kt")
         public void testAsSafe() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/asSafe.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafe.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("asSafeFail.kt")
         public void testAsSafeFail() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/asSafeFail.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeFail.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("asSafeForConstants.kt")
         public void testAsSafeForConstants() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/asSafeForConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/asSafeForConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("castGenericNull.kt")
         public void testCastGenericNull() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/castGenericNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/castGenericNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("is.kt")
         public void testIs() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/is.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/is.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIs.kt")
         public void testNotIs() throws Exception {
-            doTest("compiler/testData/codegen/box/casts/notIs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/casts/notIs.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/classes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Classes extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -677,507 +802,608 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("boxPrimitiveTypeInClinitOfClassObject.kt")
         public void testBoxPrimitiveTypeInClinitOfClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/boxPrimitiveTypeInClinitOfClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectAsExtensionReceiver.kt")
         public void testClassObjectAsExtensionReceiver() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsExtensionReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectAsStaticInitializer.kt")
         public void testClassObjectAsStaticInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectField.kt")
         public void testClassObjectField() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectInTrait.kt")
         public void testClassObjectInTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectInTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectInTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectNotOfEnum.kt")
         public void testClassObjectNotOfEnum() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectNotOfEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectToString.kt")
         public void testClassObjectToString() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectToString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectToString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectWithPrivateGenericMember.kt")
         public void testClassObjectWithPrivateGenericMember() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectWithPrivateGenericMember.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectsWithParentClasses.kt")
         public void testClassObjectsWithParentClasses() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/classObjectsWithParentClasses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegation2.kt")
         public void testDelegation2() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegation3.kt")
         public void testDelegation3() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegation3.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegation4.kt")
         public void testDelegation4() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegation4.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegation4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationGenericArg.kt")
         public void testDelegationGenericArg() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegationGenericArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationGenericArgUpperBound.kt")
         public void testDelegationGenericArgUpperBound() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericArgUpperBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationGenericLongArg.kt")
         public void testDelegationGenericLongArg() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegationGenericLongArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationGenericLongArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationJava.kt")
         public void testDelegationJava() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegationJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationJava.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationMethodsWithArgs.kt")
         public void testDelegationMethodsWithArgs() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/delegationMethodsWithArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("diamondInheritance.kt")
         public void testDiamondInheritance() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/diamondInheritance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/diamondInheritance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("exceptionConstructor.kt")
         public void testExceptionConstructor() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/exceptionConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/exceptionConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funDelegation.kt")
         public void testFunDelegation() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/funDelegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/funDelegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritSetAndHashSet.kt")
         public void testInheritSetAndHashSet() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritSetAndHashSet.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritance.kt")
         public void testInheritance() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/inheritance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritedInnerClass.kt")
         public void testInheritedInnerClass() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/inheritedInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritedMethod.kt")
         public void testInheritedMethod() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/inheritedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/inheritedMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("initializerBlock.kt")
         public void testInitializerBlock() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/initializerBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlock.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("initializerBlockDImpl.kt")
         public void testInitializerBlockDImpl() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/initializerBlockDImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/initializerBlockDImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClass.kt")
         public void testInnerClass() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/innerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/innerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1018.kt")
         public void testKt1018() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1018.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1018.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1120.kt")
         public void testKt1120() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1120.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1120.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1134.kt")
         public void testKt1134() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1134.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1134.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1157.kt")
         public void testKt1157() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1157.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1157.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1247.kt")
         public void testKt1247() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1247.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1247.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1345.kt")
         public void testKt1345() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1345.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1345.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1439.kt")
         public void testKt1439() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1439.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1439.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1535.kt")
         public void testKt1535() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1535.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1535.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1538.kt")
         public void testKt1538() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1538.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1538.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1578.kt")
         public void testKt1578() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1578.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1578.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1611.kt")
         public void testKt1611() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1611.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1611.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1721.kt")
         public void testKt1721() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1721.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1721.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1726.kt")
         public void testKt1726() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1726.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1726.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1759.kt")
         public void testKt1759() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1759.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1759.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1891.kt")
         public void testKt1891() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1891.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1891.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1918.kt")
         public void testKt1918() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1918.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1918.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1976.kt")
         public void testKt1976() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1976.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1976.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1980.kt")
         public void testKt1980() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt1980.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt1980.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2224.kt")
         public void testKt2224() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2224.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2224.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2288.kt")
         public void testKt2288() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2288.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2288.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2384.kt")
         public void testKt2384() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2384.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2384.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2390.kt")
         public void testKt2390() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2390.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2390.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2391.kt")
         public void testKt2391() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2391.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2391.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2395.kt")
         public void testKt2395() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2395.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2395.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2417.kt")
         public void testKt2417() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2417.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2417.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2477.kt")
         public void testKt2477() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2477.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2477.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2480.kt")
         public void testKt2480() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2480.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2480.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2482.kt")
         public void testKt2482() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2482.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2482.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2485.kt")
         public void testKt2485() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2485.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2485.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt249.kt")
         public void testKt249() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt249.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt249.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2532.kt")
         public void testKt2532() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2532.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2532.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2566.kt")
         public void testKt2566() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2566.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2566_2.kt")
         public void testKt2566_2() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2566_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2566_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2607.kt")
         public void testKt2607() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2607.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2607.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2626.kt")
         public void testKt2626() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2626.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2626.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2711.kt")
         public void testKt2711() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2711.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2711.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2784.kt")
         public void testKt2784() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt2784.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt2784.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt285.kt")
         public void testKt285() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt285.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt285.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3001.kt")
         public void testKt3001() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt3001.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3001.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3114.kt")
         public void testKt3114() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt3114.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3114.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3414.kt")
         public void testKt3414() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt3414.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3414.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt343.kt")
         public void testKt343() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt343.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt343.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3546.kt")
         public void testKt3546() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt3546.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3546.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3862.kt")
         public void testKt3862() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt3862.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt3862.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt454.kt")
         public void testKt454() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt454.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt454.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt471.kt")
         public void testKt471() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt471.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt471.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt48.kt")
         public void testKt48() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt48.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt48.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt496.kt")
         public void testKt496() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt496.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt496.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt500.kt")
         public void testKt500() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt500.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt500.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt501.kt")
         public void testKt501() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt501.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt501.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt504.kt")
         public void testKt504() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt504.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt504.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt508.kt")
         public void testKt508() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt508.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt508.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt633.kt")
         public void testKt633() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt633.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt633.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt707.kt")
         public void testKt707() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt707.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt707.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt723.kt")
         public void testKt723() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt723.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt723.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt725.kt")
         public void testKt725() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt725.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt725.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt903.kt")
         public void testKt903() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt903.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt903.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt940.kt")
         public void testKt940() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/kt940.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/kt940.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("outerThis.kt")
         public void testOuterThis() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/outerThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/outerThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overloadBinaryOperator.kt")
         public void testOverloadBinaryOperator() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/overloadBinaryOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadBinaryOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overloadPlusAssign.kt")
         public void testOverloadPlusAssign() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/overloadPlusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overloadPlusAssignReturn.kt")
         public void testOverloadPlusAssignReturn() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusAssignReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overloadPlusToPlusAssign.kt")
         public void testOverloadPlusToPlusAssign() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadPlusToPlusAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("overloadUnaryOperator.kt")
         public void testOverloadUnaryOperator() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/overloadUnaryOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/overloadUnaryOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateOuterFunctions.kt")
         public void testPrivateOuterFunctions() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/privateOuterFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateOuterProperty.kt")
         public void testPrivateOuterProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/privateOuterProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/privateOuterProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyDelegation.kt")
         public void testPropertyDelegation() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/propertyDelegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyDelegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyInInitializer.kt")
         public void testPropertyInInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/propertyInInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/propertyInInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rightHandOverride.kt")
         public void testRightHandOverride() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/rightHandOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/rightHandOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("selfcreate.kt")
         public void testSelfcreate() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/selfcreate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/selfcreate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleBox.kt")
         public void testSimpleBox() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/simpleBox.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/simpleBox.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typedDelegation.kt")
         public void testTypedDelegation() throws Exception {
-            doTest("compiler/testData/codegen/box/classes/typedDelegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/classes/typedDelegation.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/closures")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Closures.CaptureOuterProperty.class, Closures.ClosureInsideClosure.class})
     public static class Closures extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInClosures() throws Exception {
@@ -1186,130 +1412,156 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("capturedLocalGenericFun.kt")
         public void testCapturedLocalGenericFun() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/capturedLocalGenericFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("closureInsideConstrucor.kt")
         public void testClosureInsideConstrucor() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideConstrucor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("closureOnTopLevel1.kt")
         public void testClosureOnTopLevel1() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/closureOnTopLevel1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("closureOnTopLevel2.kt")
         public void testClosureOnTopLevel2() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/closureOnTopLevel2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureOnTopLevel2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("closureWithParameter.kt")
         public void testClosureWithParameter() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/closureWithParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("closureWithParameterAndBoxing.kt")
         public void testClosureWithParameterAndBoxing() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleEnclosedLocalVariable.kt")
         public void testDoubleEnclosedLocalVariable() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/doubleEnclosedLocalVariable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enclosingLocalVariable.kt")
         public void testEnclosingLocalVariable() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingLocalVariable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enclosingThis.kt")
         public void testEnclosingThis() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/enclosingThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/enclosingThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionClosure.kt")
         public void testExtensionClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/extensionClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/extensionClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2151.kt")
         public void testKt2151() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt2151.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt2151.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3152.kt")
         public void testKt3152() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt3152.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3152.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3523.kt")
         public void testKt3523() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt3523.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3523.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3738.kt")
         public void testKt3738() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt3738.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3738.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3905.kt")
         public void testKt3905() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt3905.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt3905.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4106.kt")
         public void testKt4106() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt4106.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4106.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4137.kt")
         public void testKt4137() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/kt4137.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/kt4137.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionInFunction.kt")
         public void testLocalFunctionInFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/localFunctionInFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunctionInInitializer.kt")
         public void testLocalFunctionInInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localFunctionInInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localGenericFun.kt")
         public void testLocalGenericFun() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/localGenericFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localGenericFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localReturn.kt")
         public void testLocalReturn() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/localReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localReturnWithAutolabel.kt")
         public void testLocalReturnWithAutolabel() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveClosure.kt")
         public void testRecursiveClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/recursiveClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/recursiveClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simplestClosure.kt")
         public void testSimplestClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/simplestClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simplestClosureAndBoxing.kt")
         public void testSimplestClosureAndBoxing() throws Exception {
-            doTest("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/simplestClosureAndBoxing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/closures/captureOuterProperty")
+        @TestDataPath("$PROJECT_ROOT")
         public static class CaptureOuterProperty extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInCaptureOuterProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1317,47 +1569,56 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("captureFunctionInProperty.kt")
             public void testCaptureFunctionInProperty() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/captureFunctionInProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inFunction.kt")
             public void testInFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inProperty.kt")
             public void testInProperty() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inPropertyDeepObjectChain.kt")
             public void testInPropertyDeepObjectChain() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyDeepObjectChain.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inPropertyFromSuperClass.kt")
             public void testInPropertyFromSuperClass() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inPropertyFromSuperSuperClass.kt")
             public void testInPropertyFromSuperSuperClass() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/inPropertyFromSuperSuperClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4176.kt")
             public void testKt4176() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4176.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4656.kt")
             public void testKt4656() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/captureOuterProperty/kt4656.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/box/closures/closureInsideClosure")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClosureInsideClosure extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInClosureInsideClosure() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1365,32 +1626,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("localFunInsideLocalFun.kt")
             public void testLocalFunInsideLocalFun() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunInsideLocalFunDifferentSignatures.kt")
             public void testLocalFunInsideLocalFunDifferentSignatures() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/localFunInsideLocalFunDifferentSignatures.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyAndFunctionNameClash.kt")
             public void testPropertyAndFunctionNameClash() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/propertyAndFunctionNameClash.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("threeLevels.kt")
             public void testThreeLevels() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevels.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("threeLevelsDifferentSignatures.kt")
             public void testThreeLevelsDifferentSignatures() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/threeLevelsDifferentSignatures.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varAsFunInsideLocalFun.kt")
             public void testVarAsFunInsideLocalFun() throws Exception {
-                doTest("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt");
+                doTest(fileName);
             }
             
         }
@@ -1405,6 +1672,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/constants")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constants extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInConstants() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/constants"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1412,22 +1680,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("constantsInWhen.kt")
         public void testConstantsInWhen() throws Exception {
-            doTest("compiler/testData/codegen/box/constants/constantsInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/constantsInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("float.kt")
         public void testFloat() throws Exception {
-            doTest("compiler/testData/codegen/box/constants/float.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/float.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("long.kt")
         public void testLong() throws Exception {
-            doTest("compiler/testData/codegen/box/constants/long.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/constants/long.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/controlStructures")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ControlStructures extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInControlStructures() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1435,287 +1707,344 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("compareBoxedIntegerToZero.kt")
         public void testCompareBoxedIntegerToZero() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/compareBoxedIntegerToZero.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conditionOfEmptyIf.kt")
         public void testConditionOfEmptyIf() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/conditionOfEmptyIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInFor.kt")
         public void testContinueInFor() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/continueInFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueInForCondition.kt")
         public void testContinueInForCondition() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueInForCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("continueToLabelInFor.kt")
         public void testContinueToLabelInFor() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/continueToLabelInFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doWhile.kt")
         public void testDoWhile() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/doWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doWhileFib.kt")
         public void testDoWhileFib() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/doWhileFib.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileFib.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doWhileWithContinue.kt")
         public void testDoWhileWithContinue() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/doWhileWithContinue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/doWhileWithContinue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyDoWhile.kt")
         public void testEmptyDoWhile() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/emptyDoWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyDoWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyFor.kt")
         public void testEmptyFor() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/emptyFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyIf.kt")
         public void testEmptyIf() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/emptyIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyWhile.kt")
         public void testEmptyWhile() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/emptyWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/emptyWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("finallyOnEmptyReturn.kt")
         public void testFinallyOnEmptyReturn() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/finallyOnEmptyReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forInSmartCastedToArray.kt")
         public void testForInSmartCastedToArray() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forInSmartCastedToArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forInSmartCastedToArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forIntArray.kt")
         public void testForIntArray() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forIntRange.kt")
         public void testForIntRange() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forIntRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forIntRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forLoopMemberExtensionAll.kt")
         public void testForLoopMemberExtensionAll() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionAll.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forLoopMemberExtensionHasNext.kt")
         public void testForLoopMemberExtensionHasNext() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionHasNext.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forLoopMemberExtensionNext.kt")
         public void testForLoopMemberExtensionNext() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forLoopMemberExtensionNext.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forNullableIntArray.kt")
         public void testForNullableIntArray() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forNullableIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forPrimitiveIntArray.kt")
         public void testForPrimitiveIntArray() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forPrimitiveIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forUserType.kt")
         public void testForUserType() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/forUserType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/forUserType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inRangeConditionsInWhen.kt")
         public void testInRangeConditionsInWhen() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/inRangeConditionsInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1441.kt")
         public void testKt1441() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt1441.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1441.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1688.kt")
         public void testKt1688() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt1688.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1688.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1742.kt")
         public void testKt1742() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt1742.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1742.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1899.kt")
         public void testKt1899() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt1899.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt1899.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2062.kt")
         public void testKt2062() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2062.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2062.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2147.kt")
         public void testKt2147() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2147.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2147.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2259.kt")
         public void testKt2259() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2259.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2259.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2291.kt")
         public void testKt2291() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2291.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2291.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt237.kt")
         public void testKt237() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt237.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt237.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2416.kt")
         public void testKt2416() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2416.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2416.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2577.kt")
         public void testKt2577() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2577.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2577.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2597.kt")
         public void testKt2597() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2597.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2597.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2598.kt")
         public void testKt2598() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt2598.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt2598.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt299.kt")
         public void testKt299() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt299.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt299.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3087.kt")
         public void testKt3087() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3087.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3087.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3203_1.kt")
         public void testKt3203_1() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3203_1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3203_2.kt")
         public void testKt3203_2() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3203_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3203_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3273.kt")
         public void testKt3273() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3273.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3273.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3280.kt")
         public void testKt3280() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3280.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3280.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3574.kt")
         public void testKt3574() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt3574.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt3574.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt416.kt")
         public void testKt416() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt416.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt416.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt513.kt")
         public void testKt513() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt513.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt513.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt628.kt")
         public void testKt628() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt628.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt628.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt769.kt")
         public void testKt769() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt769.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt769.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt772.kt")
         public void testKt772() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt772.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt772.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt773.kt")
         public void testKt773() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt773.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt773.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt870.kt")
         public void testKt870() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt870.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt870.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt910.kt")
         public void testKt910() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt910.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt910.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt958.kt")
         public void testKt958() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt958.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt958.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt998.kt")
         public void testKt998() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/kt998.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/kt998.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longRange.kt")
         public void testLongRange() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/longRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/longRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("quicksort.kt")
         public void testQuicksort() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/quicksort.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/quicksort.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryCatchFinallyChain.kt")
         public void testTryCatchFinallyChain() throws Exception {
-            doTest("compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/controlStructures/tryCatchFinallyChain.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/defaultArguments")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DefaultArguments.Constructor.class, DefaultArguments.Function.class})
     public static class DefaultArguments extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDefaultArguments() throws Exception {
@@ -1723,6 +2052,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/defaultArguments/constructor")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Constructor extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInConstructor() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1730,66 +2060,79 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("annotation.kt")
             public void testAnnotation() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/annotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/annotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("defArgs1.kt")
             public void testDefArgs1() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("defArgs1InnerClass.kt")
             public void testDefArgs1InnerClass() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1InnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs1InnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("defArgs2.kt")
             public void testDefArgs2() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/defArgs2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/defArgs2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doubleDefArgs1InnerClass.kt")
             public void testDoubleDefArgs1InnerClass() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/doubleDefArgs1InnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/doubleDefArgs1InnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/enum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumWithOneDefArg.kt")
             public void testEnumWithOneDefArg() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithOneDefArg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumWithTwoDefArgs.kt")
             public void testEnumWithTwoDefArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDefArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumWithTwoDoubleDefArgs.kt")
             public void testEnumWithTwoDoubleDefArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/enumWithTwoDoubleDefArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2852.kt")
             public void testKt2852() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt2852.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3060.kt")
             public void testKt3060() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/constructor/kt3060.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/box/defaultArguments/function")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Function extends AbstractBlackBoxCodegenTest {
             @TestMetadata("abstractClass.kt")
             public void testAbstractClass() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/abstractClass.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInFunction() throws Exception {
@@ -1798,107 +2141,128 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("augmentedAssignment.kt")
             public void testAugmentedAssignment() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignment.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("augmentedAssignmentViaBinaryExpression.kt")
             public void testAugmentedAssignmentViaBinaryExpression() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignmentViaBinaryExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/augmentedAssignmentViaBinaryExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("binaryCall.kt")
             public void testBinaryCall() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/binaryCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("binaryExpression.kt")
             public void testBinaryExpression() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/binaryExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/binaryExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("contains.kt")
             public void testContains() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/contains.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/contains.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFunctionManyArgs.kt")
             public void testExtensionFunctionManyArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extensionFunctionManyArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extensionFunctionManyArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunction.kt")
             public void testExtentionFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunctionDouble.kt")
             public void testExtentionFunctionDouble() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDouble.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDouble.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunctionDoubleTwoArgs.kt")
             public void testExtentionFunctionDoubleTwoArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDoubleTwoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionDoubleTwoArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunctionInClassObject.kt")
             public void testExtentionFunctionInClassObject() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunctionInObject.kt")
             public void testExtentionFunctionInObject() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionInObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extentionFunctionWithOneDefArg.kt")
             public void testExtentionFunctionWithOneDefArg() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionWithOneDefArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/extentionFunctionWithOneDefArg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funInTrait.kt")
             public void testFunInTrait() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/funInTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerExtentionFunction.kt")
             public void testInnerExtentionFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerExtentionFunctionDouble.kt")
             public void testInnerExtentionFunctionDouble() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDouble.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerExtentionFunctionDoubleTwoArgs.kt")
             public void testInnerExtentionFunctionDoubleTwoArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionDoubleTwoArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerExtentionFunctionManyArgs.kt")
             public void testInnerExtentionFunctionManyArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionManyArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/innerExtentionFunctionManyArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFunctionManyArgs.kt")
             public void testMemberFunctionManyArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/memberFunctionManyArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/memberFunctionManyArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("mixingNamedAndPositioned.kt")
             public void testMixingNamedAndPositioned() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/mixingNamedAndPositioned.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelManyArgs.kt")
             public void testTopLevelManyArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/topLevelManyArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/topLevelManyArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                doTest("compiler/testData/codegen/box/defaultArguments/function/trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/defaultArguments/function/trait.kt");
+                doTest(fileName);
             }
             
         }
@@ -1913,10 +2277,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/delegatedProperty")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DelegatedProperty extends AbstractBlackBoxCodegenTest {
         @TestMetadata("accessTopLevelDelegatedPropertyInClinit.kt")
         public void testAccessTopLevelDelegatedPropertyInClinit() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/accessTopLevelDelegatedPropertyInClinit.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInDelegatedProperty() throws Exception {
@@ -1925,147 +2291,176 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("capturePropertyInClosure.kt")
         public void testCapturePropertyInClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/capturePropertyInClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("castGetReturnType.kt")
         public void testCastGetReturnType() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castGetReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("castSetParameter.kt")
         public void testCastSetParameter() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/castSetParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultArgs.kt")
         public void testDefaultArgs() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/defaultArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateAsInnerClass.kt")
         public void testDelegateAsInnerClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateAsInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateByOtherProperty.kt")
         public void testDelegateByOtherProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByOtherProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateByTopLevelFun.kt")
         public void testDelegateByTopLevelFun() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateByTopLevelProperty.kt")
         public void testDelegateByTopLevelProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateByTopLevelProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateForExtProperty.kt")
         public void testDelegateForExtProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegateForExtPropertyInClass.kt")
         public void testDelegateForExtPropertyInClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/delegateForExtPropertyInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("genericDelegate.kt")
         public void testGenericDelegate() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/genericDelegate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("getAsExtensionFun.kt")
         public void testGetAsExtensionFun() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("getAsExtensionFunInClass.kt")
         public void testGetAsExtensionFunInClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/getAsExtensionFunInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassVal.kt")
         public void testInClassVal() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/inClassVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassVar.kt")
         public void testInClassVar() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/inClassVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inClassVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inTrait.kt")
         public void testInTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/inTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inferredPropertyType.kt")
         public void testInferredPropertyType() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/inferredPropertyType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4138.kt")
         public void testKt4138() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/kt4138.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateVar.kt")
         public void testPrivateVar() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/privateVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/privateVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyMetadataShouldBeCached.kt")
         public void testPropertyMetadataShouldBeCached() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/propertyMetadataShouldBeCached.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("setAsExtensionFun.kt")
         public void testSetAsExtensionFun() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("setAsExtensionFunInClass.kt")
         public void testSetAsExtensionFunInClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/setAsExtensionFunInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelVal.kt")
         public void testTopLevelVal() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelVar.kt")
         public void testTopLevelVar() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/topLevelVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("twoPropByOneDelegete.kt")
         public void testTwoPropByOneDelegete() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/twoPropByOneDelegete.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valInInnerClass.kt")
         public void testValInInnerClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/valInInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varInInnerClass.kt")
         public void testVarInInnerClass() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/varInInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("vararg.kt")
         public void testVararg() throws Exception {
-            doTest("compiler/testData/codegen/box/delegatedProperty/vararg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/delegatedProperty/vararg.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/elvis")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Elvis extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInElvis() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2073,31 +2468,37 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("genericNull.kt")
         public void testGenericNull() throws Exception {
-            doTest("compiler/testData/codegen/box/elvis/genericNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/genericNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitive.kt")
         public void testPrimitive() throws Exception {
-            doTest("compiler/testData/codegen/box/elvis/primitive.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/elvis/primitive.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/enum")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Enum extends AbstractBlackBoxCodegenTest {
         @TestMetadata("abstractMethodInEnum.kt")
         public void testAbstractMethodInEnum() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/abstractMethodInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractMethodInEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("abstractNestedClass.kt")
         public void testAbstractNestedClass() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/abstractNestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractNestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("abstractmethod.kt")
         public void testAbstractmethod() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/abstractmethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/abstractmethod.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInEnum() throws Exception {
@@ -2106,82 +2507,98 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("asReturnExpression.kt")
         public void testAsReturnExpression() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/asReturnExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/asReturnExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyEnumValuesValueOf.kt")
         public void testEmptyEnumValuesValueOf() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/emptyEnumValuesValueOf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("entrywithinner.kt")
         public void testEntrywithinner() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/entrywithinner.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/entrywithinner.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inPackage.kt")
         public void testInPackage() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/inPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inclassobj.kt")
         public void testInclassobj() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/inclassobj.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inclassobj.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inner.kt")
         public void testInner() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/inner.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/inner.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerWithExistingClassObject.kt")
         public void testInnerWithExistingClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/innerWithExistingClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1119.kt")
         public void testKt1119() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/kt1119.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt1119.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2350.kt")
         public void testKt2350() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/kt2350.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/kt2350.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("name.kt")
         public void testName() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/name.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/name.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectInEnum.kt")
         public void testObjectInEnum() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/objectInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/objectInEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ordinal.kt")
         public void testOrdinal() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/ordinal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/ordinal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("toString.kt")
         public void testToString() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/toString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/toString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valueof.kt")
         public void testValueof() throws Exception {
-            doTest("compiler/testData/codegen/box/enum/valueof.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/enum/valueof.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/exclExcl")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ExclExcl extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInExclExcl() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2189,17 +2606,20 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("genericNull.kt")
         public void testGenericNull() throws Exception {
-            doTest("compiler/testData/codegen/box/exclExcl/genericNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/genericNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitive.kt")
         public void testPrimitive() throws Exception {
-            doTest("compiler/testData/codegen/box/exclExcl/primitive.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/exclExcl/primitive.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/extensionFunctions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ExtensionFunctions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInExtensionFunctions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2207,96 +2627,115 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("kt1061.kt")
         public void testKt1061() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt1061.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1061.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1249.kt")
         public void testKt1249() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt1249.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1249.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1290.kt")
         public void testKt1290() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt1290.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1290.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1953.kt")
         public void testKt1953() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt1953.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1953_class.kt")
         public void testKt1953_class() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt1953_class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3298.kt")
         public void testKt3298() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt3298.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3298.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3646.kt")
         public void testKt3646() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt3646.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt3646.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4118.kt")
         public void testKt4118() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt4118.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt4118.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt475.kt")
         public void testKt475() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt475.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt475.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt606.kt")
         public void testKt606() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt606.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt606.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt865.kt")
         public void testKt865() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/kt865.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/kt865.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nested2.kt")
         public void testNested2() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/nested2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/nested2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("shared.kt")
         public void testShared() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/shared.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/shared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisMethodInObjectLiteral.kt")
         public void testThisMethodInObjectLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/thisMethodInObjectLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("virtual.kt")
         public void testVirtual() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/virtual.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/virtual.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenFail.kt")
         public void testWhenFail() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionFunctions/whenFail.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionFunctions/whenFail.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/extensionProperties")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ExtensionProperties extends AbstractBlackBoxCodegenTest {
         @TestMetadata("accessorForPrivateSetter.kt")
         public void testAccessorForPrivateSetter() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/accessorForPrivateSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/accessorForPrivateSetter.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInExtensionProperties() throws Exception {
@@ -2305,47 +2744,56 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("inClass.kt")
         public void testInClass() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassLongTypeInReceiver.kt")
         public void testInClassLongTypeInReceiver() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClassLongTypeInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassLongTypeInReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassWithGetter.kt")
         public void testInClassWithGetter() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithGetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassWithPrivateGetter.kt")
         public void testInClassWithPrivateGetter() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateGetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassWithPrivateSetter.kt")
         public void testInClassWithPrivateSetter() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithPrivateSetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inClassWithSetter.kt")
         public void testInClassWithSetter() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/inClassWithSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/inClassWithSetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevel.kt")
         public void testTopLevel() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/topLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevel.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelLongTypeInReceiver.kt")
         public void testTopLevelLongTypeInReceiver() throws Exception {
-            doTest("compiler/testData/codegen/box/extensionProperties/topLevelLongTypeInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/extensionProperties/topLevelLongTypeInReceiver.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/fakeOverride")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FakeOverride extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFakeOverride() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fakeOverride"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2353,27 +2801,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("diamondFunction.kt")
         public void testDiamondFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/fakeOverride/diamondFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/diamondFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("function.kt")
         public void testFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/fakeOverride/function.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/function.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyGetter.kt")
         public void testPropertyGetter() throws Exception {
-            doTest("compiler/testData/codegen/box/fakeOverride/propertyGetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertyGetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertySetter.kt")
         public void testPropertySetter() throws Exception {
-            doTest("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fakeOverride/propertySetter.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/fieldRename")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FieldRename extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFieldRename() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2381,22 +2834,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("constructorAndClassObject.kt")
         public void testConstructorAndClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/constructorAndClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegates.kt")
         public void testDelegates() throws Exception {
-            doTest("compiler/testData/codegen/box/fieldRename/delegates.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/delegates.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("genericPropertyWithItself.kt")
         public void testGenericPropertyWithItself() throws Exception {
-            doTest("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/fieldRename/genericPropertyWithItself.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/finally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Finally extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/finally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2404,62 +2861,74 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("finallyAndFinally.kt")
         public void testFinallyAndFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/finallyAndFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/finallyAndFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3549.kt")
         public void testKt3549() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt3549.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3549.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3706.kt")
         public void testKt3706() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt3706.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3706.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3867.kt")
         public void testKt3867() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt3867.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3867.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3874.kt")
         public void testKt3874() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt3874.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3874.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3894.kt")
         public void testKt3894() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt3894.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt3894.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4134.kt")
         public void testKt4134() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/kt4134.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/kt4134.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("loopAndFinally.kt")
         public void testLoopAndFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/loopAndFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/loopAndFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notChainCatch.kt")
         public void testNotChainCatch() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/notChainCatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/notChainCatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryFinally.kt")
         public void testTryFinally() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/tryFinally.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryFinally.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tryLoopTry.kt")
         public void testTryLoopTry() throws Exception {
-            doTest("compiler/testData/codegen/box/finally/tryLoopTry.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/finally/tryLoopTry.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/functions")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Functions.Invoke.class, Functions.LocalFunctions.class, Functions.TailRecursion.class})
     public static class Functions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFunctions() throws Exception {
@@ -2468,210 +2937,252 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("coerceVoidToArray.kt")
         public void testCoerceVoidToArray() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/coerceVoidToArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("coerceVoidToObject.kt")
         public void testCoerceVoidToObject() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/coerceVoidToObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/coerceVoidToObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs.kt")
         public void testDefaultargs() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs1.kt")
         public void testDefaultargs1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs2.kt")
         public void testDefaultargs2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs3.kt")
         public void testDefaultargs3() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs3.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs4.kt")
         public void testDefaultargs4() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs4.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs5.kt")
         public void testDefaultargs5() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs5.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs6.kt")
         public void testDefaultargs6() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs6.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs6.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultargs7.kt")
         public void testDefaultargs7() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/defaultargs7.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/defaultargs7.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ea33909.kt")
         public void testEa33909() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/ea33909.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/ea33909.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fakeDescriptorWithSeveralOverridenOne.kt")
         public void testFakeDescriptorWithSeveralOverridenOne() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/fakeDescriptorWithSeveralOverridenOne.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionExpression.kt")
         public void testFunctionExpression() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/functionExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionNtoString.kt")
         public void testFunctionNtoString() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/functionNtoString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/functionNtoString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixRecursiveCall.kt")
         public void testInfixRecursiveCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/infixRecursiveCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/infixRecursiveCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1038.kt")
         public void testKt1038() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1038.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1038.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1199.kt")
         public void testKt1199() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1199.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1199.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1291.kt")
         public void testKt1291() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1291.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1291.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1413.kt")
         public void testKt1413() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1413.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1413.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1649_1.kt")
         public void testKt1649_1() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1649_1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1649_2.kt")
         public void testKt1649_2() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1649_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1649_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1739.kt")
         public void testKt1739() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt1739.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt1739.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2270.kt")
         public void testKt2270() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2270.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2270.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2271.kt")
         public void testKt2271() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2271.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2271.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2280.kt")
         public void testKt2280() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2280.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2280.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2481.kt")
         public void testKt2481() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2481.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2481.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2716.kt")
         public void testKt2716() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2716.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2716.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2739.kt")
         public void testKt2739() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2739.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2739.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2929.kt")
         public void testKt2929() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt2929.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt2929.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3214.kt")
         public void testKt3214() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt3214.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3214.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3313.kt")
         public void testKt3313() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt3313.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3313.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3573.kt")
         public void testKt3573() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt3573.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3573.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3724.kt")
         public void testKt3724() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt3724.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt3724.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt395.kt")
         public void testKt395() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt395.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt395.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt785.kt")
         public void testKt785() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt785.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt785.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt873.kt")
         public void testKt873() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/kt873.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/kt873.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localFunction.kt")
         public void testLocalFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/localFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nothisnoclosure.kt")
         public void testNothisnoclosure() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/nothisnoclosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("prefixRecursiveCall.kt")
         public void testPrefixRecursiveCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/prefixRecursiveCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveCompareTo.kt")
         public void testRecursiveCompareTo() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/recursiveCompareTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveCompareTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("recursiveIncrementCall.kt")
         public void testRecursiveIncrementCall() throws Exception {
-            doTest("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/recursiveIncrementCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/functions/invoke")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Invoke.OnObjects.class})
         public static class Invoke extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInInvoke() throws Exception {
@@ -2680,60 +3191,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("extensionInvokeOnExpr.kt")
             public void testExtensionInvokeOnExpr() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invoke.kt")
             public void testInvoke() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/invoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invokeOnExprByConvention.kt")
             public void testInvokeOnExprByConvention() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3189.kt")
             public void testKt3189() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3189.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3189.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3190.kt")
             public void testKt3190() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3190.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3190.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3297.kt")
             public void testKt3297() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3297.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3297.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3450getAndInvoke.kt")
             public void testKt3450getAndInvoke() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3450getAndInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3450getAndInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3631invokeOnString.kt")
             public void testKt3631invokeOnString() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3631invokeOnString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3631invokeOnString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3772.kt")
             public void testKt3772() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3772.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3772.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3821invokeOnThis.kt")
             public void testKt3821invokeOnThis() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3821invokeOnThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3822invokeOnThis.kt")
             public void testKt3822invokeOnThis() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/kt3822invokeOnThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects")
+            @TestDataPath("$PROJECT_ROOT")
             public static class OnObjects extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInOnObjects() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2741,52 +3264,62 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("invokeOnClassObject1.kt")
                 public void testInvokeOnClassObject1() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnClassObject2.kt")
                 public void testInvokeOnClassObject2() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnClassObjectOfNestedClass1.kt")
                 public void testInvokeOnClassObjectOfNestedClass1() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnClassObjectOfNestedClass2.kt")
                 public void testInvokeOnClassObjectOfNestedClass2() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnEnum1.kt")
                 public void testInvokeOnEnum1() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnEnum2.kt")
                 public void testInvokeOnEnum2() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnImportedEnum1.kt")
                 public void testInvokeOnImportedEnum1() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnImportedEnum2.kt")
                 public void testInvokeOnImportedEnum2() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnObject1.kt")
                 public void testInvokeOnObject1() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("invokeOnObject2.kt")
                 public void testInvokeOnObject2() throws Exception {
-                    doTest("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2800,6 +3333,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/functions/localFunctions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class LocalFunctions extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInLocalFunctions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2807,67 +3341,80 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("kt2895.kt")
             public void testKt2895() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt2895.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt2895.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3308.kt")
             public void testKt3308() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt3308.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3308.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3978.kt")
             public void testKt3978() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt3978.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt3978.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4119.kt")
             public void testKt4119() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4119.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4119_2.kt")
             public void testKt4119_2() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4119_2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4119_2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4514.kt")
             public void testKt4514() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4514.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4777.kt")
             public void testKt4777() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4777.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4783.kt")
             public void testKt4783() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4783.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt4784.kt")
             public void testKt4784() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/kt4784.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/kt4784.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localExtensionOnNullableParameter.kt")
             public void testLocalExtensionOnNullableParameter() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localExtensionOnNullableParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunctionInConstructor.kt")
             public void testLocalFunctionInConstructor() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localWithDefault.kt")
             public void testLocalWithDefault() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/localFunctions/localWithDefault.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/localFunctions/localWithDefault.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TailRecursion extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInTailRecursion() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2875,182 +3422,218 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("defaultArgs.kt")
             public void testDefaultArgs() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionTailCall.kt")
             public void testExtensionTailCall() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionWithNoTails.kt")
             public void testFunctionWithNoTails() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionWithNonTailRecursions.kt")
             public void testFunctionWithNonTailRecursions() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionWithoutAnnotation.kt")
             public void testFunctionWithoutAnnotation() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("infixCall.kt")
             public void testInfixCall() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("infixRecursiveCall.kt")
             public void testInfixRecursiveCall() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("insideElvis.kt")
             public void testInsideElvis() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/insideElvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("labeledThisReferences.kt")
             public void testLabeledThisReferences() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("loops.kt")
             public void testLoops() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/loops.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/loops.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multilevelBlocks.kt")
             public void testMultilevelBlocks() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("realIteratorFoldl.kt")
             public void testRealIteratorFoldl() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("realStringEscape.kt")
             public void testRealStringEscape() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("realStringRepeat.kt")
             public void testRealStringRepeat() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursiveCallInLambda.kt")
             public void testRecursiveCallInLambda() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursiveCallInLocalFunction.kt")
             public void testRecursiveCallInLocalFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("recursiveInnerFunction.kt")
             public void testRecursiveInnerFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnIf.kt")
             public void testReturnIf() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInCatch.kt")
             public void testReturnInCatch() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInFinally.kt")
             public void testReturnInFinally() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInIfInFinally.kt")
             public void testReturnInIfInFinally() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInParentheses.kt")
             public void testReturnInParentheses() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("returnInTry.kt")
             public void testReturnInTry() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/returnInTry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleBlock.kt")
             public void testSimpleBlock() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleReturn.kt")
             public void testSimpleReturn() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleReturnWithElse.kt")
             public void testSimpleReturnWithElse() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("sum.kt")
             public void testSum() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/sum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/sum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tailCallInBlockInParentheses.kt")
             public void testTailCallInBlockInParentheses() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tailCallInParentheses.kt")
             public void testTailCallInParentheses() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("tailRecursionInFinally.kt")
             public void testTailRecursionInFinally() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thisReferences.kt")
             public void testThisReferences() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/thisReferences.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unitBlocks.kt")
             public void testUnitBlocks() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenWithCondition.kt")
             public void testWhenWithCondition() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenWithInRange.kt")
             public void testWhenWithInRange() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenWithIs.kt")
             public void testWhenWithIs() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("whenWithoutCondition.kt")
             public void testWhenWithoutCondition() throws Exception {
-                doTest("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.kt");
+                doTest(fileName);
             }
             
         }
@@ -3066,6 +3649,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/innerNested")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InnerNested extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInInnerNested() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3073,87 +3657,104 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("createNestedClass.kt")
         public void testCreateNestedClass() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/createNestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createNestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("createdNestedInOuterMember.kt")
         public void testCreatedNestedInOuterMember() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/createdNestedInOuterMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/createdNestedInOuterMember.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("dataLocalVariable.kt")
         public void testDataLocalVariable() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/dataLocalVariable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionFun.kt")
         public void testExtensionFun() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/extensionFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/extensionFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("importNestedClass.kt")
         public void testImportNestedClass() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/importNestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/importNestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerGeneric.kt")
         public void testInnerGeneric() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/innerGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerLabeledThis.kt")
         public void testInnerLabeledThis() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerLabeledThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerSimple.kt")
         public void testInnerSimple() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/innerSimple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/innerSimple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3132.kt")
         public void testKt3132() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/kt3132.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/kt3132.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassInObject.kt")
         public void testNestedClassInObject() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedClassInObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassInObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassObject.kt")
         public void testNestedClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedEnumConstant.kt")
         public void testNestedEnumConstant() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedEnumConstant.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedGeneric.kt")
         public void testNestedGeneric() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedInPackage.kt")
         public void testNestedInPackage() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedInPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedInPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedObjects.kt")
         public void testNestedObjects() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedObjects.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedObjects.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedSimple.kt")
         public void testNestedSimple() throws Exception {
-            doTest("compiler/testData/codegen/box/innerNested/nestedSimple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/innerNested/nestedSimple.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/instructions")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Instructions.Swap.class})
     public static class Instructions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInInstructions() throws Exception {
@@ -3161,6 +3762,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/instructions/swap")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Swap extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInSwap() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3168,12 +3770,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("swapRefToSharedVarInt.kt")
             public void testSwapRefToSharedVarInt() throws Exception {
-                doTest("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("swapRefToSharedVarLong.kt")
             public void testSwapRefToSharedVarLong() throws Exception {
-                doTest("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/instructions/swap/swapRefToSharedVarLong.kt");
+                doTest(fileName);
             }
             
         }
@@ -3187,6 +3791,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/intrinsics")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Intrinsics extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInIntrinsics() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3194,42 +3799,50 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("compareTo.kt")
         public void testCompareTo() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/compareTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/compareTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ea35953.kt")
         public void testEa35953() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/ea35953.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/ea35953.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longRangeWithExplicitDot.kt")
         public void testLongRangeWithExplicitDot() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/longRangeWithExplicitDot.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("prefixIncDec.kt")
         public void testPrefixIncDec() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/prefixIncDec.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rangeFromCollection.kt")
         public void testRangeFromCollection() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/rangeFromCollection.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringFromCollection.kt")
         public void testStringFromCollection() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/stringFromCollection.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tostring.kt")
         public void testTostring() throws Exception {
-            doTest("compiler/testData/codegen/box/intrinsics/tostring.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/intrinsics/tostring.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/javaInterop")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({JavaInterop.ObjectMethods.class})
     public static class JavaInterop extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInJavaInterop() throws Exception {
@@ -3237,6 +3850,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/javaInterop/objectMethods")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ObjectMethods extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInObjectMethods() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/objectMethods"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3244,32 +3858,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("cloneCallsConstructor.kt")
             public void testCloneCallsConstructor() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cloneCallsSuper.kt")
             public void testCloneCallsSuper() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cloneCallsSuperAndModifies.kt")
             public void testCloneCallsSuperAndModifies() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneCallsSuperAndModifies.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cloneHashSet.kt")
             public void testCloneHashSet() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHashSet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cloneHierarchy.kt")
             public void testCloneHierarchy() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneHierarchy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("cloneableClassWithoutClone.kt")
             public void testCloneableClassWithoutClone() throws Exception {
-                doTest("compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/javaInterop/objectMethods/cloneableClassWithoutClone.kt");
+                doTest(fileName);
             }
             
         }
@@ -3283,6 +3903,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/labels")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Labels extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLabels() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/labels"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3290,32 +3911,38 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("propertyAccessor.kt")
         public void testPropertyAccessor() throws Exception {
-            doTest("compiler/testData/codegen/box/labels/propertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorFunctionLiteral.kt")
         public void testPropertyAccessorFunctionLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorInnerExtensionFun.kt")
         public void testPropertyAccessorInnerExtensionFun() throws Exception {
-            doTest("compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccessorObject.kt")
         public void testPropertyAccessorObject() throws Exception {
-            doTest("compiler/testData/codegen/box/labels/propertyAccessorObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyAccessorObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyInClassAccessor.kt")
         public void testPropertyInClassAccessor() throws Exception {
-            doTest("compiler/testData/codegen/box/labels/propertyInClassAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/labels/propertyInClassAccessor.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/localClasses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalClasses extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLocalClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3323,92 +3950,110 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("anonymousObjectInInitializer.kt")
         public void testAnonymousObjectInInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("anonymousObjectInParameterInitializer.kt")
         public void testAnonymousObjectInParameterInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/anonymousObjectInParameterInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inExtensionFunction.kt")
         public void testInExtensionFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inExtensionProperty.kt")
         public void testInExtensionProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/inExtensionProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inExtensionProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inLocalExtensionFunction.kt")
         public void testInLocalExtensionFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/inLocalExtensionFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inLocalExtensionProperty.kt")
         public void testInLocalExtensionProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/inLocalExtensionProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/inLocalExtensionProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassInLocalClass.kt")
         public void testInnerClassInLocalClass() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/innerClassInLocalClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/innerClassInLocalClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2700.kt")
         public void testKt2700() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/kt2700.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2700.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2873.kt")
         public void testKt2873() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/kt2873.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt2873.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3210.kt")
         public void testKt3210() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/kt3210.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3210.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3389.kt")
         public void testKt3389() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/kt3389.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/kt3389.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localClass.kt")
         public void testLocalClass() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/localClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localClassInInitializer.kt")
         public void testLocalClassInInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/localClassInInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localClassInParameterInitializer.kt")
         public void testLocalClassInParameterInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/localClassInParameterInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/localClassInParameterInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noclosure.kt")
         public void testNoclosure() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/noclosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/noclosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/object.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/object.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("withclosure.kt")
         public void testWithclosure() throws Exception {
-            doTest("compiler/testData/codegen/box/localClasses/withclosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/localClasses/withclosure.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/multiDecl")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({MultiDecl.ForArray.class, MultiDecl.ForIterator.class, MultiDecl.ForRange.class})
     public static class MultiDecl extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInMultiDecl() throws Exception {
@@ -3417,60 +4062,72 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("ComplexInitializer.kt")
         public void testComplexInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/ComplexInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ComplexInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("component.kt")
         public void testComponent() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/component.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/component.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleVals.kt")
         public void testSimpleVals() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/SimpleVals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleValsExtensions.kt")
         public void testSimpleValsExtensions() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/SimpleValsExtensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleValsExtensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleVarsExtensions.kt")
         public void testSimpleVarsExtensions() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/SimpleVarsExtensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/SimpleVarsExtensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ValCapturedInFunctionLiteral.kt")
         public void testValCapturedInFunctionLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/ValCapturedInFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ValCapturedInLocalFunction.kt")
         public void testValCapturedInLocalFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/ValCapturedInLocalFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInLocalFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ValCapturedInObjectLiteral.kt")
         public void testValCapturedInObjectLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/ValCapturedInObjectLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/ValCapturedInObjectLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarCapturedInFunctionLiteral.kt")
         public void testVarCapturedInFunctionLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/VarCapturedInFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarCapturedInLocalFunction.kt")
         public void testVarCapturedInLocalFunction() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/VarCapturedInLocalFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInLocalFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarCapturedInObjectLiteral.kt")
         public void testVarCapturedInObjectLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/multiDecl/VarCapturedInObjectLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/VarCapturedInObjectLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ForArray.Int.class, ForArray.Long.class})
         public static class ForArray extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInForArray() throws Exception {
@@ -3479,30 +4136,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("MultiDeclFor.kt")
             public void testMultiDeclFor() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentExtensions.kt")
             public void testMultiDeclForComponentExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
             public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
             public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForValCaptured.kt")
             public void testMultiDeclForValCaptured() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForValCaptured.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/MultiDeclForValCaptured.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/int")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Int extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInInt() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/int"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3510,27 +4173,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                 public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/long")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Long extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInLong() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/long"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3538,22 +4206,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                 public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forArray/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3568,6 +4240,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ForIterator.LongIterator.class})
         public static class ForIterator extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInForIterator() throws Exception {
@@ -3576,30 +4249,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("MultiDeclFor.kt")
             public void testMultiDeclFor() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentExtensions.kt")
             public void testMultiDeclForComponentExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
             public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
             public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForValCaptured.kt")
             public void testMultiDeclForValCaptured() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/MultiDeclForValCaptured.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator")
+            @TestDataPath("$PROJECT_ROOT")
             public static class LongIterator extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInLongIterator() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3607,22 +4286,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                 public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3636,6 +4319,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         }
         
         @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class})
         public static class ForRange extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInForRange() throws Exception {
@@ -3644,30 +4328,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("MultiDeclFor.kt")
             public void testMultiDeclFor() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentExtensions.kt")
             public void testMultiDeclForComponentExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
             public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensions.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
             public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultiDeclForValCaptured.kt")
             public void testMultiDeclForValCaptured() throws Exception {
-                doTest("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/MultiDeclForValCaptured.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class})
             public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInExplicitRangeTo() throws Exception {
@@ -3676,30 +4366,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclFor.kt")
                 public void testMultiDeclFor() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclFor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForValCaptured.kt")
                 public void testMultiDeclForValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/MultiDeclForValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Int extends AbstractBlackBoxCodegenTest {
                     public void testAllFilesPresentInInt() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3707,27 +4403,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     
                     @TestMetadata("MultiDeclForComponentExtensions.kt")
                     public void testMultiDeclForComponentExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                     public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                     public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                     public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        doTest(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Long extends AbstractBlackBoxCodegenTest {
                     public void testAllFilesPresentInLong() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3735,22 +4436,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     
                     @TestMetadata("MultiDeclForComponentExtensions.kt")
                     public void testMultiDeclForComponentExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                     public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                     public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                     public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        doTest(fileName);
                     }
                     
                 }
@@ -3765,6 +4470,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class})
             public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception {
@@ -3773,30 +4479,36 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclFor.kt")
                 public void testMultiDeclFor() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclFor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForValCaptured.kt")
                 public void testMultiDeclForValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/MultiDeclForValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Int extends AbstractBlackBoxCodegenTest {
                     public void testAllFilesPresentInInt() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3804,27 +4516,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     
                     @TestMetadata("MultiDeclForComponentExtensions.kt")
                     public void testMultiDeclForComponentExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                     public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                     public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                     public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        doTest(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Long extends AbstractBlackBoxCodegenTest {
                     public void testAllFilesPresentInLong() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3832,22 +4549,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     
                     @TestMetadata("MultiDeclForComponentExtensions.kt")
                     public void testMultiDeclForComponentExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                     public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                     public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensions.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                     public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                        doTest("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                        doTest(fileName);
                     }
                     
                 }
@@ -3862,6 +4583,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/int")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Int extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInInt() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3869,27 +4591,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                 public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/int/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/long")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Long extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInLong() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3897,22 +4624,26 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 
                 @TestMetadata("MultiDeclForComponentExtensions.kt")
                 public void testMultiDeclForComponentExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentExtensionsValCaptured.kt")
                 public void testMultiDeclForComponentExtensionsValCaptured() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentExtensionsValCaptured.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensions.kt")
                 public void testMultiDeclForComponentMemberExtensions() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultiDeclForComponentMemberExtensionsInExtensionFunction.kt")
                 public void testMultiDeclForComponentMemberExtensionsInExtensionFunction() throws Exception {
-                    doTest("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/multiDecl/forRange/long/MultiDeclForComponentMemberExtensionsInExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -3939,6 +4670,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/objects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Objects extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3946,152 +4678,182 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("flist.kt")
         public void testFlist() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/flist.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/flist.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1047.kt")
         public void testKt1047() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt1047.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1047.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1136.kt")
         public void testKt1136() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt1136.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1136.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1186.kt")
         public void testKt1186() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt1186.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1186.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1600.kt")
         public void testKt1600() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt1600.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1600.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1737.kt")
         public void testKt1737() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt1737.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt1737.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2398.kt")
         public void testKt2398() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2398.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2398.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2663.kt")
         public void testKt2663() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2663.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2663_2.kt")
         public void testKt2663_2() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2663_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2663_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2675.kt")
         public void testKt2675() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2675.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2675.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2719.kt")
         public void testKt2719() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2719.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2719.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2822.kt")
         public void testKt2822() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt2822.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt2822.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3238.kt")
         public void testKt3238() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt3238.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3238.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3684.kt")
         public void testKt3684() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt3684.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt3684.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4086.kt")
         public void testKt4086() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt4086.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt4086.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt535.kt")
         public void testKt535() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt535.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt535.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt560.kt")
         public void testKt560() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt560.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt560.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt640.kt")
         public void testKt640() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt640.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt640.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt694.kt")
         public void testKt694() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/kt694.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt694.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("methodOnObject.kt")
         public void testMethodOnObject() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/methodOnObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/methodOnObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedObjectWithSuperclass.kt")
         public void testNestedObjectWithSuperclass() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/nestedObjectWithSuperclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectInLocalAnonymousObject.kt")
         public void testObjectInLocalAnonymousObject() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectInLocalAnonymousObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectLiteral.kt")
         public void testObjectLiteral() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/objectLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectLiteralInClosure.kt")
         public void testObjectLiteralInClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectLiteralInClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectWithSuperclass.kt")
         public void testObjectWithSuperclass() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/objectWithSuperclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectWithSuperclassAndTrait.kt")
         public void testObjectWithSuperclassAndTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/objectWithSuperclassAndTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverInConstructor.kt")
         public void testReceiverInConstructor() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/receiverInConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/receiverInConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleObject.kt")
         public void testSimpleObject() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/simpleObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/simpleObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisInConstructor.kt")
         public void testThisInConstructor() throws Exception {
-            doTest("compiler/testData/codegen/box/objects/thisInConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/thisInConstructor.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/operatorConventions")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({OperatorConventions.CompareTo.class})
     public static class OperatorConventions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInOperatorConventions() throws Exception {
@@ -4100,20 +4862,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("assignmentOperations.kt")
         public void testAssignmentOperations() throws Exception {
-            doTest("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/assignmentOperations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incDecOnObject.kt")
         public void testIncDecOnObject() throws Exception {
-            doTest("compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/incDecOnObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4152.kt")
         public void testKt4152() throws Exception {
-            doTest("compiler/testData/codegen/box/operatorConventions/kt4152.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4152.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/operatorConventions/compareTo")
+        @TestDataPath("$PROJECT_ROOT")
         public static class CompareTo extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInCompareTo() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4121,52 +4887,62 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("boolean.kt")
             public void testBoolean() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/boolean.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("comparable.kt")
             public void testComparable() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/comparable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doubleInt.kt")
             public void testDoubleInt() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/doubleInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doubleLong.kt")
             public void testDoubleLong() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/doubleLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/doubleLong.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionArray.kt")
             public void testExtensionArray() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionObject.kt")
             public void testExtensionObject() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/extensionObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("intDouble.kt")
             public void testIntDouble() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/intDouble.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intDouble.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("intLong.kt")
             public void testIntLong() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/intLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/intLong.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longDouble.kt")
             public void testLongDouble() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/longDouble.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longDouble.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longInt.kt")
             public void testLongInt() throws Exception {
-                doTest("compiler/testData/codegen/box/operatorConventions/compareTo/longInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/compareTo/longInt.kt");
+                doTest(fileName);
             }
             
         }
@@ -4180,6 +4956,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/package")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Package extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInPackage() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/package"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4187,47 +4964,56 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("boxPrimitiveTypeInClinit.kt")
         public void testBoxPrimitiveTypeInClinit() throws Exception {
-            doTest("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/boxPrimitiveTypeInClinit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("checkCast.kt")
         public void testCheckCast() throws Exception {
-            doTest("compiler/testData/codegen/box/package/checkCast.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/checkCast.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incrementProperty.kt")
         public void testIncrementProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/package/incrementProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/incrementProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("initializationOrder.kt")
         public void testInitializationOrder() throws Exception {
-            doTest("compiler/testData/codegen/box/package/initializationOrder.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/initializationOrder.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokespecial.kt")
         public void testInvokespecial() throws Exception {
-            doTest("compiler/testData/codegen/box/package/invokespecial.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/invokespecial.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullablePrimitiveNoFieldInitializer.kt")
         public void testNullablePrimitiveNoFieldInitializer() throws Exception {
-            doTest("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/nullablePrimitiveNoFieldInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("packageQualifiedMethod.kt")
         public void testPackageQualifiedMethod() throws Exception {
-            doTest("compiler/testData/codegen/box/package/packageQualifiedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/packageQualifiedMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateTopLevelPropAndVarInInner.kt")
         public void testPrivateTopLevelPropAndVarInInner() throws Exception {
-            doTest("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/package/privateTopLevelPropAndVarInInner.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/primitiveTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PrimitiveTypes extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInPrimitiveTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4235,256 +5021,307 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("comparisonWithNaN.kt")
         public void testComparisonWithNaN() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/comparisonWithNaN.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNaN.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("comparisonWithNullCallsFun.kt")
         public void testComparisonWithNullCallsFun() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/comparisonWithNullCallsFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/comparisonWithNullCallsFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ea35963.kt")
         public void testEa35963() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/ea35963.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/ea35963.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("equalsHashCodeToString.kt")
         public void testEqualsHashCodeToString() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/equalsHashCodeToString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/equalsHashCodeToString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("incrementByteCharShort.kt")
         public void testIncrementByteCharShort() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/incrementByteCharShort.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/incrementByteCharShort.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intLiteralIsNotNull.kt")
         public void testIntLiteralIsNotNull() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/intLiteralIsNotNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1054.kt")
         public void testKt1054() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt1054.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1054.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1055.kt")
         public void testKt1055() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt1055.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1055.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1093.kt")
         public void testKt1093() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt1093.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1093.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1508.kt")
         public void testKt1508() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1508.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1634.kt")
         public void testKt1634() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt1634.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt1634.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2251.kt")
         public void testKt2251() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt2251.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2251.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2269.kt")
         public void testKt2269() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt2269.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2269.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2275.kt")
         public void testKt2275() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt2275.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2275.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt239.kt")
         public void testKt239() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt239.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt239.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt242.kt")
         public void testKt242() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt242.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt242.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt243.kt")
         public void testKt243() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt243.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt243.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt248.kt")
         public void testKt248() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt248.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt248.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2768.kt")
         public void testKt2768() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt2768.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2768.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2794.kt")
         public void testKt2794() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt2794.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt2794.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3078.kt")
         public void testKt3078() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt3078.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3078.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3517.kt")
         public void testKt3517() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt3517.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3517.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3576.kt")
         public void testKt3576() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt3576.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3576.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3613.kt")
         public void testKt3613() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt3613.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt3613.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4097.kt")
         public void testKt4097() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt4097.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4097.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4098.kt")
         public void testKt4098() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt4098.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4098.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4210.kt")
         public void testKt4210() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt4210.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4210.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4251.kt")
         public void testKt4251() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt4251.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt4251.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt446.kt")
         public void testKt446() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt446.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt446.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt518.kt")
         public void testKt518() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt518.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt518.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt665.kt")
         public void testKt665() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt665.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt665.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt684.kt")
         public void testKt684() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt684.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt684.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt711.kt")
         public void testKt711() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt711.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt711.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt737.kt")
         public void testKt737() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt737.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt737.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt752.kt")
         public void testKt752() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt752.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt752.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt753.kt")
         public void testKt753() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt753.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt753.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt756.kt")
         public void testKt756() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt756.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt756.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt757.kt")
         public void testKt757() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt757.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt757.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt828.kt")
         public void testKt828() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt828.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt828.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt877.kt")
         public void testKt877() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt877.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt877.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt882.kt")
         public void testKt882() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt882.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt882.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt887.kt")
         public void testKt887() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt887.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt887.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt935.kt")
         public void testKt935() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt935.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt935.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt945.kt")
         public void testKt945() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/kt945.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/kt945.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullAsNullableIntIsNull.kt")
         public void testNullAsNullableIntIsNull() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullAsNullableIntIsNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableCharBoolean.kt")
         public void testNullableCharBoolean() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/nullableCharBoolean.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/nullableCharBoolean.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rangeTo.kt")
         public void testRangeTo() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/rangeTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unboxComparable.kt")
         public void testUnboxComparable() throws Exception {
-            doTest("compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/primitiveTypes/unboxComparable.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/properties")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Properties extends AbstractBlackBoxCodegenTest {
         @TestMetadata("accessToPrivateProperty.kt")
         public void testAccessToPrivateProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/accessToPrivateProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("accessToPrivateSetter.kt")
         public void testAccessToPrivateSetter() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/accessToPrivateSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/accessToPrivateSetter.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInProperties() throws Exception {
@@ -4493,177 +5330,212 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("classObjectProperties.kt")
         public void testClassObjectProperties() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/classObjectProperties.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/classObjectProperties.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("generalAccess.kt")
         public void testGeneralAccess() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/generalAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/generalAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1159.kt")
         public void testKt1159() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1159.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1159.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1165.kt")
         public void testKt1165() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1165.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1165.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1168.kt")
         public void testKt1168() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1168.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1168.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1170.kt")
         public void testKt1170() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1170.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1170.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1398.kt")
         public void testKt1398() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1398.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1398.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1417.kt")
         public void testKt1417() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1417.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1417.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1482_2279.kt")
         public void testKt1482_2279() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1482_2279.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1482_2279.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1714.kt")
         public void testKt1714() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1714.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1714_minimal.kt")
         public void testKt1714_minimal() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1714_minimal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1714_minimal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1892.kt")
         public void testKt1892() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt1892.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt1892.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2331.kt")
         public void testKt2331() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt2331.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2331.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt257.kt")
         public void testKt257() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt257.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt257.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2655.kt")
         public void testKt2655() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt2655.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2655.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2786.kt")
         public void testKt2786() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt2786.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2786.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2892.kt")
         public void testKt2892() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt2892.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt2892.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3118.kt")
         public void testKt3118() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt3118.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3118.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3524.kt")
         public void testKt3524() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt3524.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3524.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3551.kt")
         public void testKt3551() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt3551.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3551.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3556.kt")
         public void testKt3556() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt3556.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt3556.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4140.kt")
         public void testKt4140() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4140.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4140.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4252.kt")
         public void testKt4252() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4252.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4252_2.kt")
         public void testKt4252_2() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4252_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4252_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4340.kt")
         public void testKt4340() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4340.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4340.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4373.kt")
         public void testKt4373() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4373.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4373.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4383.kt")
         public void testKt4383() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt4383.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt4383.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt613.kt")
         public void testKt613() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/kt613.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/kt613.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitiveOverrideDefaultAccessor.kt")
         public void testPrimitiveOverrideDefaultAccessor() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/primitiveOverrideDefaultAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDefaultAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitiveOverrideDelegateAccessor.kt")
         public void testPrimitiveOverrideDelegateAccessor() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/primitiveOverrideDelegateAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privatePropertyInConstructor.kt")
         public void testPrivatePropertyInConstructor() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyInConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privatePropertyWithoutBackingField.kt")
         public void testPrivatePropertyWithoutBackingField() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/privatePropertyWithoutBackingField.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("traitExtendsClass.kt")
         public void testTraitExtendsClass() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/traitExtendsClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/traitExtendsClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("twoAnnotatedExtensionPropertiesWithoutBackingFields.kt")
         public void testTwoAnnotatedExtensionPropertiesWithoutBackingFields() throws Exception {
-            doTest("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/properties/twoAnnotatedExtensionPropertiesWithoutBackingFields.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Reflection extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInReflection() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4671,12 +5543,14 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("functionLiteralGenericSignature.kt")
         public void testFunctionLiteralGenericSignature() throws Exception {
-            doTest("compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/regressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Regressions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInRegressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4684,27 +5558,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("kt3173.kt")
         public void testKt3173() throws Exception {
-            doTest("compiler/testData/codegen/box/regressions/kt3173.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3173.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3999.kt")
         public void testKt3999() throws Exception {
-            doTest("compiler/testData/codegen/box/regressions/kt3999.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt3999.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4682.kt")
         public void testKt4682() throws Exception {
-            doTest("compiler/testData/codegen/box/regressions/kt4682.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4682.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unjustifiedReferenceTarget.kt")
         public void testUnjustifiedReferenceTarget() throws Exception {
-            doTest("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/safeCall")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SafeCall extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSafeCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4712,37 +5591,44 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("genericNull.kt")
         public void testGenericNull() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/genericNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/genericNull.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1572.kt")
         public void testKt1572() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/kt1572.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt1572.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt232.kt")
         public void testKt232() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/kt232.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt232.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt245.kt")
         public void testKt245() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/kt245.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt245.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt247.kt")
         public void testKt247() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/kt247.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/kt247.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitive.kt")
         public void testPrimitive() throws Exception {
-            doTest("compiler/testData/codegen/box/safeCall/primitive.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/safeCall/primitive.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/samConstructors")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SamConstructors extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSamConstructors() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4750,62 +5636,74 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("comparator.kt")
         public void testComparator() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/comparator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/comparator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("filenameFilter.kt")
         public void testFilenameFilter() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/filenameFilter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/filenameFilter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonLiteralComparator.kt")
         public void testNonLiteralComparator() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonLiteralFilenameFilter.kt")
         public void testNonLiteralFilenameFilter() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonLiteralRunnable.kt")
         public void testNonLiteralRunnable() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonTrivialRunnable.kt")
         public void testNonTrivialRunnable() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("runnable.kt")
         public void testRunnable() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/runnable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("runnableAccessingClosure1.kt")
         public void testRunnableAccessingClosure1() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("runnableAccessingClosure2.kt")
         public void testRunnableAccessingClosure2() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sameWrapperClass.kt")
         public void testSameWrapperClass() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("syntheticVsReal.kt")
         public void testSyntheticVsReal() throws Exception {
-            doTest("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/strings")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Strings extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInStrings() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/strings"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4813,52 +5711,62 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("ea35743.kt")
         public void testEa35743() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/ea35743.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/ea35743.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2592.kt")
         public void testKt2592() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/kt2592.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt2592.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3652.kt")
         public void testKt3652() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/kt3652.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt3652.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt881.kt")
         public void testKt881() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/kt881.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt881.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt889.kt")
         public void testKt889() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/kt889.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt889.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt894.kt")
         public void testKt894() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/kt894.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/kt894.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineStringsWithTemplates.kt")
         public void testMultilineStringsWithTemplates() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/multilineStringsWithTemplates.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rawStrings.kt")
         public void testRawStrings() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/rawStrings.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStrings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rawStringsWithManyQuotes.kt")
         public void testRawStringsWithManyQuotes() throws Exception {
-            doTest("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/strings/rawStringsWithManyQuotes.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/super")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Super extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSuper() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/super"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4866,107 +5774,128 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("basicmethodSuperClass.kt")
         public void testBasicmethodSuperClass() throws Exception {
-            doTest("compiler/testData/codegen/box/super/basicmethodSuperClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("basicmethodSuperTrait.kt")
         public void testBasicmethodSuperTrait() throws Exception {
-            doTest("compiler/testData/codegen/box/super/basicmethodSuperTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicmethodSuperTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("basicproperty.kt")
         public void testBasicproperty() throws Exception {
-            doTest("compiler/testData/codegen/box/super/basicproperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/basicproperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enclosedFun.kt")
         public void testEnclosedFun() throws Exception {
-            doTest("compiler/testData/codegen/box/super/enclosedFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enclosedVar.kt")
         public void testEnclosedVar() throws Exception {
-            doTest("compiler/testData/codegen/box/super/enclosedVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/enclosedVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassLabeledSuper.kt")
         public void testInnerClassLabeledSuper() throws Exception {
-            doTest("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassLabeledSuper2.kt")
         public void testInnerClassLabeledSuper2() throws Exception {
-            doTest("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuper2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassLabeledSuperProperty.kt")
         public void testInnerClassLabeledSuperProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassLabeledSuperProperty2.kt")
         public void testInnerClassLabeledSuperProperty2() throws Exception {
-            doTest("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/innerClassLabeledSuperProperty2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3492ClassFun.kt")
         public void testKt3492ClassFun() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt3492ClassFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3492ClassProperty.kt")
         public void testKt3492ClassProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt3492ClassProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492ClassProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3492TraitFun.kt")
         public void testKt3492TraitFun() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt3492TraitFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3492TraitProperty.kt")
         public void testKt3492TraitProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt3492TraitProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3492TraitProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3538.kt")
         public void testKt3538() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt3538.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt3538.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4173.kt")
         public void testKt4173() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt4173.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4173_2.kt")
         public void testKt4173_2() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt4173_2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4173_3.kt")
         public void testKt4173_3() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt4173_3.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4173_3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4982.kt")
         public void testKt4982() throws Exception {
-            doTest("compiler/testData/codegen/box/super/kt4982.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/kt4982.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleSuperTraits.kt")
         public void testMultipleSuperTraits() throws Exception {
-            doTest("compiler/testData/codegen/box/super/multipleSuperTraits.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/multipleSuperTraits.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("traitproperty.kt")
         public void testTraitproperty() throws Exception {
-            doTest("compiler/testData/codegen/box/super/traitproperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/super/traitproperty.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/superConstructorCall")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SuperConstructorCall extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSuperConstructorCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4974,72 +5903,86 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("deepInnerHierarchy.kt")
         public void testDeepInnerHierarchy() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepInnerHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("deepLocalHierarchy.kt")
         public void testDeepLocalHierarchy() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/deepLocalHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerExtendsOuter.kt")
         public void testInnerExtendsOuter() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/innerExtendsOuter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localExtendsLocalWithClosure.kt")
         public void testLocalExtendsLocalWithClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localExtendsLocalWithClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("localWithClosureExtendsLocalWithClosure.kt")
         public void testLocalWithClosureExtendsLocalWithClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/localWithClosureExtendsLocalWithClosure.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsClassDefaultArgument.kt")
         public void testObjectExtendsClassDefaultArgument() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassDefaultArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsClassVararg.kt")
         public void testObjectExtendsClassVararg() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsClassVararg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsInner.kt")
         public void testObjectExtendsInner() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInner.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsInnerDefaultArgument.kt")
         public void testObjectExtendsInnerDefaultArgument() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerDefaultArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsInnerOfLocalVarargAndDefault.kt")
         public void testObjectExtendsInnerOfLocalVarargAndDefault() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalVarargAndDefault.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsInnerOfLocalWithCapture.kt")
         public void testObjectExtendsInnerOfLocalWithCapture() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsInnerOfLocalWithCapture.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsLocalCaptureInSuperCall.kt")
         public void testObjectExtendsLocalCaptureInSuperCall() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalCaptureInSuperCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectExtendsLocalWithClosure.kt")
         public void testObjectExtendsLocalWithClosure() throws Exception {
-            doTest("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/superConstructorCall/objectExtendsLocalWithClosure.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/toArray")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ToArray extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInToArray() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/toArray"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5047,17 +5990,20 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("toArray.kt")
         public void testToArray() throws Exception {
-            doTest("compiler/testData/codegen/box/toArray/toArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/toArray/toArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("toArrayAlreadyPresent.kt")
         public void testToArrayAlreadyPresent() throws Exception {
-            doTest("compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/toArray/toArrayAlreadyPresent.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/traits")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Traits.WithRequired.class})
     public static class Traits extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTraits() throws Exception {
@@ -5066,70 +6012,84 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("finalMethod.kt")
         public void testFinalMethod() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/finalMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/finalMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("genericMethod.kt")
         public void testGenericMethod() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/genericMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/genericMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritedFun.kt")
         public void testInheritedFun() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/inheritedFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritedVar.kt")
         public void testInheritedVar() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/inheritedVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/inheritedVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1936.kt")
         public void testKt1936() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt1936.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt1936_1.kt")
         public void testKt1936_1() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt1936_1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt1936_1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2260.kt")
         public void testKt2260() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt2260.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2260.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2399.kt")
         public void testKt2399() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt2399.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2399.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2541.kt")
         public void testKt2541() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt2541.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt2541.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3315.kt")
         public void testKt3315() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt3315.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3315.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3500.kt")
         public void testKt3500() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/kt3500.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/kt3500.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multiple.kt")
         public void testMultiple() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/multiple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/multiple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stdlib.kt")
         public void testStdlib() throws Exception {
-            doTest("compiler/testData/codegen/box/traits/stdlib.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/stdlib.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/box/traits/withRequired")
+        @TestDataPath("$PROJECT_ROOT")
         public static class WithRequired extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInWithRequired() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits/withRequired"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5137,62 +6097,74 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             
             @TestMetadata("generic.kt")
             public void testGeneric() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/generic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/generic.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericProperty.kt")
             public void testGenericProperty() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/genericProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/genericProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt1936_2.kt")
             public void testKt1936_2() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/kt1936_2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/kt1936_2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt2963.kt")
             public void testKt2963() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/kt2963.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/kt2963.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3413.kt")
             public void testKt3413() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/kt3413.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/kt3413.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kt3429.kt")
             public void testKt3429() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/kt3429.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/kt3429.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("property.kt")
             public void testProperty() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/property.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/property.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("propertyViaBridge.kt")
             public void testPropertyViaBridge() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/propertyViaBridge.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/propertyViaBridge.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("super.kt")
             public void testSuper() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/super.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/super.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("superViaBridge.kt")
             public void testSuperViaBridge() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/superViaBridge.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/superViaBridge.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("traitFuncCall.kt")
             public void testTraitFuncCall() throws Exception {
-                doTest("compiler/testData/codegen/box/traits/withRequired/traitFuncCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/traits/withRequired/traitFuncCall.kt");
+                doTest(fileName);
             }
             
         }
@@ -5206,6 +6178,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     }
     
     @TestMetadata("compiler/testData/codegen/box/typeInfo")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeInfo extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTypeInfo() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5213,42 +6186,50 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("asInLoop.kt")
         public void testAsInLoop() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/asInLoop.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/asInLoop.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitSmartCastedThis.kt")
         public void testImplicitSmartCastedThis() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/implicitSmartCastedThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/implicitSmartCastedThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inheritance.kt")
         public void testInheritance() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/inheritance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/inheritance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2811.kt")
         public void testKt2811() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/kt2811.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/kt2811.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt511.kt")
         public void testKt511() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/kt511.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/kt511.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("primitiveTypeInfo.kt")
         public void testPrimitiveTypeInfo() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("smartCastedThis.kt")
         public void testSmartCastedThis() throws Exception {
-            doTest("compiler/testData/codegen/box/typeInfo/smartCastedThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/smartCastedThis.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/typeMapping")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeMapping extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTypeMapping() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5256,37 +6237,44 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("kt2831.kt")
         public void testKt2831() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/kt2831.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt2831.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3286.kt")
         public void testKt3286() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/kt3286.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3286.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3863.kt")
         public void testKt3863() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/kt3863.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3863.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3976.kt")
         public void testKt3976() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/kt3976.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/kt3976.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nothing.kt")
         public void testNothing() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/nothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nothing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableNothing.kt")
         public void testNullableNothing() throws Exception {
-            doTest("compiler/testData/codegen/box/typeMapping/nullableNothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeMapping/nullableNothing.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/unaryOp")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnaryOp extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInUnaryOp() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unaryOp"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5294,37 +6282,44 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("call.kt")
         public void testCall() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/call.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/call.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callNullable.kt")
         public void testCallNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/callNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callWithCommonType.kt")
         public void testCallWithCommonType() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/callWithCommonType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/callWithCommonType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrinsic.kt")
         public void testIntrinsic() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/intrinsic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrinsicNullable.kt")
         public void testIntrinsicNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/intrinsicNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/intrinsicNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longOverflow.kt")
         public void testLongOverflow() throws Exception {
-            doTest("compiler/testData/codegen/box/unaryOp/longOverflow.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unaryOp/longOverflow.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/unit")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Unit extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInUnit() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unit"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5332,57 +6327,68 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("closureReturnsNullableUnit.kt")
         public void testClosureReturnsNullableUnit() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/closureReturnsNullableUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3634.kt")
         public void testKt3634() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/kt3634.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt3634.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4212.kt")
         public void testKt4212() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/kt4212.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4212.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4265.kt")
         public void testKt4265() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/kt4265.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/kt4265.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableUnit.kt")
         public void testNullableUnit() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/nullableUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableUnitInWhen1.kt")
         public void testNullableUnitInWhen1() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/nullableUnitInWhen1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableUnitInWhen2.kt")
         public void testNullableUnitInWhen2() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/nullableUnitInWhen2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableUnitInWhen3.kt")
         public void testNullableUnitInWhen3() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/nullableUnitInWhen3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unitClassObject.kt")
         public void testUnitClassObject() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/unitClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/unitClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnitValue.kt")
         public void testUnitValue() throws Exception {
-            doTest("compiler/testData/codegen/box/unit/UnitValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/unit/UnitValue.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/vararg")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Vararg extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInVararg() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5390,27 +6396,32 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("kt1978.kt")
         public void testKt1978() throws Exception {
-            doTest("compiler/testData/codegen/box/vararg/kt1978.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt1978.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt581.kt")
         public void testKt581() throws Exception {
-            doTest("compiler/testData/codegen/box/vararg/kt581.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt581.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt796_797.kt")
         public void testKt796_797() throws Exception {
-            doTest("compiler/testData/codegen/box/vararg/kt796_797.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/kt796_797.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varargsAndFunctionLiterals.kt")
         public void testVarargsAndFunctionLiterals() throws Exception {
-            doTest("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/vararg/varargsAndFunctionLiterals.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/box/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -5418,92 +6429,110 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         
         @TestMetadata("callProperty.kt")
         public void testCallProperty() throws Exception {
-            doTest("compiler/testData/codegen/box/when/callProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/callProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("is.kt")
         public void testIs() throws Exception {
-            doTest("compiler/testData/codegen/box/when/is.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/is.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2457.kt")
         public void testKt2457() throws Exception {
-            doTest("compiler/testData/codegen/box/when/kt2457.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2457.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt2466.kt")
         public void testKt2466() throws Exception {
-            doTest("compiler/testData/codegen/box/when/kt2466.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/kt2466.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longInRange.kt")
         public void testLongInRange() throws Exception {
-            doTest("compiler/testData/codegen/box/when/longInRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/longInRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("matchNotNullAgainstNullable.kt")
         public void testMatchNotNullAgainstNullable() throws Exception {
-            doTest("compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/matchNotNullAgainstNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseAssigned.kt")
         public void testNoElseAssigned() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseAssigned.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssigned.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseAssignedNoMatch.kt")
         public void testNoElseAssignedNoMatch() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseAssignedNoMatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseAssignedNoMatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseExhaustive.kt")
         public void testNoElseExhaustive() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseExhaustive.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustive.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseExhaustiveStatement.kt")
         public void testNoElseExhaustiveStatement() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveStatement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseExhaustiveUnitExpected.kt")
         public void testNoElseExhaustiveUnitExpected() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseExhaustiveUnitExpected.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseInRetunedExpression.kt")
         public void testNoElseInRetunedExpression() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseInRetunedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseInRetunedExpressionNoMatch.kt")
         public void testNoElseInRetunedExpressionNoMatch() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseInRetunedExpressionNoMatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInRetunedExpressionNoMatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseInStatement.kt")
         public void testNoElseInStatement() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseInStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseInStatement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noElseNoMatch.kt")
         public void testNoElseNoMatch() throws Exception {
-            doTest("compiler/testData/codegen/box/when/noElseNoMatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/noElseNoMatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableWhen.kt")
         public void testNullableWhen() throws Exception {
-            doTest("compiler/testData/codegen/box/when/nullableWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/nullableWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("range.kt")
         public void testRange() throws Exception {
-            doTest("compiler/testData/codegen/box/when/range.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/range.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whenArgumentIsEvaluatedOnlyOnce.kt")
         public void testWhenArgumentIsEvaluatedOnlyOnce() throws Exception {
-            doTest("compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/when/whenArgumentIsEvaluatedOnlyOnce.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
index 8b7d284cb05..f011f5de93e 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxInlineCodegenTestGenerated.AnonymousObject.class, BlackBoxInlineCodegenTestGenerated.Builders.class, BlackBoxInlineCodegenTestGenerated.Capture.class, BlackBoxInlineCodegenTestGenerated.Complex.class, BlackBoxInlineCodegenTestGenerated.DefaultValues.class, BlackBoxInlineCodegenTestGenerated.LambdaClassClash.class, BlackBoxInlineCodegenTestGenerated.LambdaTransformation.class, BlackBoxInlineCodegenTestGenerated.LocalFunInLambda.class, BlackBoxInlineCodegenTestGenerated.NoInline.class, BlackBoxInlineCodegenTestGenerated.NonLocalReturns.class, BlackBoxInlineCodegenTestGenerated.Simple.class, BlackBoxInlineCodegenTestGenerated.Special.class, BlackBoxInlineCodegenTestGenerated.Trait.class, BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class})
 public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AnonymousObject extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInAnonymousObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -42,27 +45,32 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("anonymousObjectOnCallSite.1.kt")
         public void testAnonymousObjectOnCallSite() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
         public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
         public void testAnonymousObjectOnDeclarationSite() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
         public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Builders extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBuilders() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -70,17 +78,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("builders.1.kt")
         public void testBuilders() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("buildersAndLambdaCapturing.1.kt")
         public void testBuildersAndLambdaCapturing() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Capture extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCapture() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -88,37 +99,44 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("captureInlinable.1.kt")
         public void testCaptureInlinable() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureInlinableAndOther.1.kt")
         public void testCaptureInlinableAndOther() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureThisAndReceiver.1.kt")
         public void testCaptureThisAndReceiver() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("generics.1.kt")
         public void testGenerics() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInClass.1.kt")
         public void testSimpleCapturingInClass() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInPackage.1.kt")
         public void testSimpleCapturingInPackage() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Complex extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInComplex() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -126,32 +144,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("closureChain.1.kt")
         public void testClosureChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("forEachLine.1.kt")
         public void testForEachLine() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda.1.kt")
         public void testLambdaInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("use.1.kt")
         public void testUse() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("with.1.kt")
         public void testWith() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DefaultValues extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDefaultValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -159,32 +183,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("defaultInExtension.1.kt")
         public void testDefaultInExtension() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethod.1.kt")
         public void testDefaultMethod() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethodInClass.1.kt")
         public void testDefaultMethodInClass() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineInDefaultParameter.1.kt")
         public void testInlineInDefaultParameter() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDefaultMethod.1.kt")
         public void testSimpleDefaultMethod() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaClassClash extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLambdaClassClash() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -192,17 +222,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("lambdaClassClash.1.kt")
         public void testLambdaClassClash() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaX2.1.kt")
         public void testNoInlineLambdaX2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaTransformation extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLambdaTransformation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -210,32 +243,38 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("lambdaCloning.1.kt")
         public void testLambdaCloning() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda2.1.kt")
         public void testLambdaInLambda2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambdaNoInline.1.kt")
         public void testLambdaInLambdaNoInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("regeneratedLambdaName.1.kt")
         public void testRegeneratedLambdaName() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("sameCaptured.1.kt")
         public void testSameCaptured() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalFunInLambda extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInLocalFunInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -243,12 +282,14 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("localFunInLambda.1.kt")
         public void testLocalFunInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NoInline extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInNoInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -256,27 +297,32 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("noInline.1.kt")
         public void testNoInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChain.1.kt")
         public void testNoInlineLambdaChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
         public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("withoutInline.1.kt")
         public void testWithoutInline() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class})
     public static class NonLocalReturns extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -285,40 +331,48 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("explicitLocalReturn.1.kt")
         public void testExplicitLocalReturn() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("justReturnInLambda.1.kt")
         public void testJustReturnInLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("nestedNonLocals.1.kt")
         public void testNestedNonLocals() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLocalReturn.1.kt")
         public void testNoInlineLocalReturn() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("propertyAccessors.1.kt")
         public void testPropertyAccessors() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simple.1.kt")
         public void testSimple() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleVoid.1.kt")
         public void testSimpleVoid() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Deparenthesize extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInDeparenthesize() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -326,17 +380,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
             
             @TestMetadata("bracket.1.kt")
             public void testBracket() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
             @TestMetadata("labeled.1.kt")
             public void testLabeled() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TryFinally extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInTryFinally() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -344,7 +401,8 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
             
             @TestMetadata("external.1.kt")
             public void testExternal() throws Exception {
-                doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                doTestMultiFileWithInlineCheck(fileName);
             }
             
         }
@@ -359,6 +417,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Simple extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSimple() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -366,72 +425,86 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("classObject.1.kt")
         public void testClassObject() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("extension.1.kt")
         public void testExtension() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("params.1.kt")
         public void testParams() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("rootConstructor.1.kt")
         public void testRootConstructor() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalClosures.1.kt")
         public void testSeveralClosures() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalUsage.1.kt")
         public void testSeveralUsage() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDouble.1.kt")
         public void testSimpleDouble() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleEnum.1.kt")
         public void testSimpleEnum() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleGenerics.1.kt")
         public void testSimpleGenerics() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleInt.1.kt")
         public void testSimpleInt() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleLambda.1.kt")
         public void testSimpleLambda() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleObject.1.kt")
         public void testSimpleObject() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("vararg.1.kt")
         public void testVararg() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/special")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Special extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInSpecial() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -439,37 +512,44 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("identityCheck.1.kt")
         public void testIdentityCheck() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("ifBranches.1.kt")
         public void testIfBranches() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("iinc.1.kt")
         public void testIinc() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineChain.1.kt")
         public void testInlineChain() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("plusAssign.1.kt")
         public void testPlusAssign() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("stackHeightBug.1.kt")
         public void testStackHeightBug() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Trait extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTrait() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -477,12 +557,14 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("trait.1.kt")
         public void testTrait() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatchFinally extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -490,17 +572,20 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT
         
         @TestMetadata("tryCatch.1.kt")
         public void testTryCatch() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatch2.1.kt")
         public void testTryCatch2() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatchFinally.1.kt")
         public void testTryCatchFinally() throws Exception {
-            doTestMultiFileWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            doTestMultiFileWithInlineCheck(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
index 900342864bd..9b19f63a9d4 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,10 +29,12 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxMultiFile")
+@TestDataPath("$PROJECT_ROOT")
 public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     @TestMetadata("accessorForProtected")
     public void testAccessorForProtected() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/accessorForProtected/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/accessorForProtected/");
+        doTestMultiFile(fileName);
     }
     
     public void testAllFilesPresentInBoxMultiFile() throws Exception {
@@ -40,52 +43,62 @@ public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodeg
     
     @TestMetadata("internalVisibility")
     public void testInternalVisibility() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/internalVisibility/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/internalVisibility/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1515")
     public void testKt1515() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1515/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1515/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1528")
     public void testKt1528() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1528/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1528/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt1845")
     public void testKt1845() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt1845/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt1845/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt2060")
     public void testKt2060() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2060/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2060/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("kt2257")
     public void testKt2257() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/kt2257/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/kt2257/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("nestedPackages")
     public void testNestedPackages() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/nestedPackages/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/nestedPackages/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("samWrappersDifferentFiles")
     public void testSamWrappersDifferentFiles() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/samWrappersDifferentFiles/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("sameFileName")
     public void testSameFileName() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/sameFileName/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/sameFileName/");
+        doTestMultiFile(fileName);
     }
     
     @TestMetadata("simple")
     public void testSimple() throws Exception {
-        doTestMultiFile("compiler/testData/codegen/boxMultiFile/simple/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxMultiFile/simple/");
+        doTestMultiFile(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
index adf8a3a531c..dcc90c500b2 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxWithJava")
+@TestDataPath("$PROJECT_ROOT")
 public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxWithJava() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,7 +37,8 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege
     
     @TestMetadata("referenceToJavaFieldOfKotlinSubclass")
     public void testReferenceToJavaFieldOfKotlinSubclass() throws Exception {
-        doTestWithJava("compiler/testData/codegen/boxWithJava/referenceToJavaFieldOfKotlinSubclass/");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithJava/referenceToJavaFieldOfKotlinSubclass/");
+        doTestWithJava(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
index d7c86d2447e..3ffdd8c83a7 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.codegen.generated;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxWithStdlib")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.BoxingOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Reflection.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class, BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class})
 public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
     public void testAllFilesPresentInBoxWithStdlib() throws Exception {
@@ -35,6 +37,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Annotations extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,52 +45,62 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("annotatedEnumEntry.kt")
         public void testAnnotatedEnumEntry() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/annotatedEnumEntry.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("defaultParameterValues.kt")
         public void testDefaultParameterValues() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/defaultParameterValues.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("jvmFlags.kt")
         public void testJvmFlags() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/jvmFlags.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/jvmFlags.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kotlinPropertyFromClassObjectAsParameter.kt")
         public void testKotlinPropertyFromClassObjectAsParameter() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinPropertyFromClassObjectAsParameter.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kotlinTopLevelPropertyAsParameter.kt")
         public void testKotlinTopLevelPropertyAsParameter() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/kotlinTopLevelPropertyAsParameter.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("nestedClassPropertyAsParameter.kt")
         public void testNestedClassPropertyAsParameter() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/nestedClassPropertyAsParameter.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("parameterWithPrimitiveType.kt")
         public void testParameterWithPrimitiveType() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/parameterWithPrimitiveType.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("propertyWithPropertyInInitializerAsParameter.kt")
         public void testPropertyWithPropertyInInitializerAsParameter() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/propertyWithPropertyInInitializerAsParameter.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("varargInAnnotationParameter.kt")
         public void testVarargInAnnotationParameter() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/annotations/varargInAnnotationParameter.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/arrays")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Arrays extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInArrays() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/arrays"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -95,22 +108,26 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("cloneArray.kt")
         public void testCloneArray() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/cloneArray.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("clonePrimitiveArrays.kt")
         public void testClonePrimitiveArrays() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/clonePrimitiveArrays.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt3771.kt")
         public void testKt3771() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/arrays/kt3771.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BoxingOptimization extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInBoxingOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -118,62 +135,74 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("casts.kt")
         public void testCasts() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/casts.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("checkcastAndInstanceOf.kt")
         public void testCheckcastAndInstanceOf() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/checkcastAndInstanceOf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/checkcastAndInstanceOf.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("fold.kt")
         public void testFold() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/fold.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/fold.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt5493.kt")
         public void testKt5493() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5493.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt5588.kt")
         public void testKt5588() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/kt5588.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("nullCheck.kt")
         public void testNullCheck() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/nullCheck.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/nullCheck.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("progressions.kt")
         public void testProgressions() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/progressions.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("safeCallWithElvis.kt")
         public void testSafeCallWithElvis() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/safeCallWithElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/safeCallWithElvis.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/simple.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("unsafeRemoving.kt")
         public void testUnsafeRemoving() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/unsafeRemoving.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/unsafeRemoving.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("variables.kt")
         public void testVariables() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/boxingOptimization/variables.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization/variables.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CallableReference.Function.class, CallableReference.Property.class})
     public static class CallableReference extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCallableReference() throws Exception {
@@ -181,11 +210,13 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Function.Local.class})
         public static class Function extends AbstractBlackBoxCodegenTest {
             @TestMetadata("abstractClassMember.kt")
             public void testAbstractClassMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/abstractClassMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             public void testAllFilesPresentInFunction() throws Exception {
@@ -194,200 +225,240 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("booleanNotIntrinsic.kt")
             public void testBooleanNotIntrinsic() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/booleanNotIntrinsic.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromClass.kt")
             public void testClassMemberFromClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromExtension.kt")
             public void testClassMemberFromExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromTopLevelStringNoArgs.kt")
             public void testClassMemberFromTopLevelStringNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromTopLevelStringOneStringArg.kt")
             public void testClassMemberFromTopLevelStringOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelStringOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromTopLevelUnitNoArgs.kt")
             public void testClassMemberFromTopLevelUnitNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("classMemberFromTopLevelUnitOneStringArg.kt")
             public void testClassMemberFromTopLevelUnitOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/classMemberFromTopLevelUnitOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("constructorFromTopLevelNoArgs.kt")
             public void testConstructorFromTopLevelNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("constructorFromTopLevelOneStringArg.kt")
             public void testConstructorFromTopLevelOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/constructorFromTopLevelOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("enumNameMethod.kt")
             public void testEnumNameMethod() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/enumNameMethod.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("equalsIntrinsic.kt")
             public void testEqualsIntrinsic() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/equalsIntrinsic.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromClass.kt")
             public void testExtensionFromClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromExtension.kt")
             public void testExtensionFromExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromTopLevelStringNoArgs.kt")
             public void testExtensionFromTopLevelStringNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromTopLevelStringOneStringArg.kt")
             public void testExtensionFromTopLevelStringOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelStringOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromTopLevelUnitNoArgs.kt")
             public void testExtensionFromTopLevelUnitNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionFromTopLevelUnitOneStringArg.kt")
             public void testExtensionFromTopLevelUnitOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/extensionFromTopLevelUnitOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("genericMember.kt")
             public void testGenericMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/genericMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("innerConstructorFromClass.kt")
             public void testInnerConstructorFromClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("innerConstructorFromExtension.kt")
             public void testInnerConstructorFromExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("innerConstructorFromTopLevelNoArgs.kt")
             public void testInnerConstructorFromTopLevelNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("innerConstructorFromTopLevelOneStringArg.kt")
             public void testInnerConstructorFromTopLevelOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/innerConstructorFromTopLevelOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nestedConstructorFromClass.kt")
             public void testNestedConstructorFromClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nestedConstructorFromTopLevelNoArgs.kt")
             public void testNestedConstructorFromTopLevelNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nestedConstructorFromTopLevelOneStringArg.kt")
             public void testNestedConstructorFromTopLevelOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/nestedConstructorFromTopLevelOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("newArray.kt")
             public void testNewArray() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/newArray.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("objectMemberUnitNoArgs.kt")
             public void testObjectMemberUnitNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("objectMemberUnitOneStringArg.kt")
             public void testObjectMemberUnitOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/objectMemberUnitOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("privateClassMember.kt")
             public void testPrivateClassMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/privateClassMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("sortListOfStrings.kt")
             public void testSortListOfStrings() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/sortListOfStrings.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("toString.kt")
             public void testToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/toString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/toString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromClass.kt")
             public void testTopLevelFromClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromExtension.kt")
             public void testTopLevelFromExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevelStringNoArgs.kt")
             public void testTopLevelFromTopLevelStringNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevelStringOneStringArg.kt")
             public void testTopLevelFromTopLevelStringOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelStringOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevelUnitNoArgs.kt")
             public void testTopLevelFromTopLevelUnitNoArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitNoArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelFromTopLevelUnitOneStringArg.kt")
             public void testTopLevelFromTopLevelUnitOneStringArg() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/topLevelFromTopLevelUnitOneStringArg.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("traitImplMethodWithClassReceiver.kt")
             public void testTraitImplMethodWithClassReceiver() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitImplMethodWithClassReceiver.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("traitMember.kt")
             public void testTraitMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/traitMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Local extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInLocal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -395,92 +466,110 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 
                 @TestMetadata("captureOuter.kt")
                 public void testCaptureOuter() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/captureOuter.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("classMember.kt")
                 public void testClassMember() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/classMember.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("closureWithSideEffect.kt")
                 public void testClosureWithSideEffect() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/closureWithSideEffect.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("constructor.kt")
                 public void testConstructor() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructor.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("constructorWithInitializer.kt")
                 public void testConstructorWithInitializer() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("enumExtendsTrait.kt")
                 public void testEnumExtendsTrait() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/enumExtendsTrait.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("extension.kt")
                 public void testExtension() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extension.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("extensionToLocalClass.kt")
                 public void testExtensionToLocalClass() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToLocalClass.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("extensionToPrimitive.kt")
                 public void testExtensionToPrimitive() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionToPrimitive.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("extensionWithClosure.kt")
                 public void testExtensionWithClosure() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/extensionWithClosure.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("genericMember.kt")
                 public void testGenericMember() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/genericMember.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("localClassMember.kt")
                 public void testLocalClassMember() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localClassMember.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("localLocal.kt")
                 public void testLocalLocal() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/localLocal.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("recursiveClosure.kt")
                 public void testRecursiveClosure() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/recursiveClosure.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("simple.kt")
                 public void testSimple() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simple.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("simpleClosure.kt")
                 public void testSimpleClosure() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleClosure.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("simpleWithArg.kt")
                 public void testSimpleWithArg() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/simpleWithArg.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("unitWithSideEffect.kt")
                 public void testUnitWithSideEffect() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local/unitWithSideEffect.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
             }
@@ -494,10 +583,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Property extends AbstractBlackBoxCodegenTest {
             @TestMetadata("accessViaSubclass.kt")
             public void testAccessViaSubclass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/accessViaSubclass.kt");
+                doTestWithStdlib(fileName);
             }
             
             public void testAllFilesPresentInProperty() throws Exception {
@@ -506,82 +597,98 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("delegated.kt")
             public void testDelegated() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegated.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("delegatedMutable.kt")
             public void testDelegatedMutable() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/delegatedMutable.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("javaBeanConvention.kt")
             public void testJavaBeanConvention() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/javaBeanConvention.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("kClassInstanceIsInitializedFirst.kt")
             public void testKClassInstanceIsInitializedFirst() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/kClassInstanceIsInitializedFirst.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("localClassVar.kt")
             public void testLocalClassVar() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/localClassVar.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("overriddenInSubclass.kt")
             public void testOverriddenInSubclass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/overriddenInSubclass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("privateClassVal.kt")
             public void testPrivateClassVal() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVal.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("privateClassVar.kt")
             public void testPrivateClassVar() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/privateClassVar.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("protectedClassVar.kt")
             public void testProtectedClassVar() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/protectedClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/protectedClassVar.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("publicClassValAccessible.kt")
             public void testPublicClassValAccessible() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/publicClassValAccessible.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleExtension.kt")
             public void testSimpleExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleMember.kt")
             public void testSimpleMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleMutableExtension.kt")
             public void testSimpleMutableExtension() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableExtension.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleMutableMember.kt")
             public void testSimpleMutableMember() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableMember.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleMutableTopLevel.kt")
             public void testSimpleMutableTopLevel() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleMutableTopLevel.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleTopLevel.kt")
             public void testSimpleTopLevel() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property/simpleTopLevel.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -596,6 +703,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/casts")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Casts extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInCasts() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/casts"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -603,12 +711,14 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("asWithGeneric.kt")
         public void testAsWithGeneric() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/casts/asWithGeneric.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DataClasses.Copy.class, DataClasses.Equals.class, DataClasses.Hashcode.class, DataClasses.Tostring.class})
     public static class DataClasses extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDataClasses() throws Exception {
@@ -617,65 +727,78 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("arrayParams.kt")
         public void testArrayParams() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/arrayParams.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("changingVarParam.kt")
         public void testChangingVarParam() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/changingVarParam.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("genericParam.kt")
         public void testGenericParam() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/genericParam.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt5002.kt")
         public void testKt5002() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/kt5002.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("mixedParams.kt")
         public void testMixedParams() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/mixedParams.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("multiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclaration.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("multiDeclarationFor.kt")
         public void testMultiDeclarationFor() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/multiDeclarationFor.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("overriddenProperty.kt")
         public void testOverriddenProperty() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/overriddenProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/overriddenProperty.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("privateValParams.kt")
         public void testPrivateValParams() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/privateValParams.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("twoValParams.kt")
         public void testTwoValParams() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoValParams.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("twoVarParams.kt")
         public void testTwoVarParams() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/twoVarParams.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("unitComponent.kt")
         public void testUnitComponent() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/unitComponent.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Copy extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInCopy() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -683,47 +806,56 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("constructorWithDefaultParam.kt")
             public void testConstructorWithDefaultParam() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/constructorWithDefaultParam.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("copyInNestedDataClass.kt")
             public void testCopyInNestedDataClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInNestedDataClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInNestedDataClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("copyInObjectNestedDataClass.kt")
             public void testCopyInObjectNestedDataClass() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/copyInObjectNestedDataClass.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("kt3033.kt")
             public void testKt3033() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/kt3033.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("paramWithoutProperty.kt")
             public void testParamWithoutProperty() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/paramWithoutProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/paramWithoutProperty.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("valInConstructorParams.kt")
             public void testValInConstructorParams() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/valInConstructorParams.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("varInConstructorParams.kt")
             public void testVarInConstructorParams() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/varInConstructorParams.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("withGenericParameter.kt")
             public void testWithGenericParameter() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy/withGenericParameter.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Equals extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInEquals() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -731,42 +863,50 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("alreadyDeclared.kt")
             public void testAlreadyDeclared() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclared.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/alreadyDeclaredWrongSignature.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("genericarray.kt")
             public void testGenericarray() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/genericarray.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("instanceof.kt")
             public void testInstanceof() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/instanceof.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/instanceof.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("intarray.kt")
             public void testIntarray() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/intarray.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nullother.kt")
             public void testNullother() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/nullother.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("sameinstance.kt")
             public void testSameinstance() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals/sameinstance.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Hashcode extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInHashcode() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -774,72 +914,86 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("alreadyDeclared.kt")
             public void testAlreadyDeclared() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclared.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/alreadyDeclaredWrongSignature.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("array.kt")
             public void testArray() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/array.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("boolean.kt")
             public void testBoolean() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/boolean.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("byte.kt")
             public void testByte() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/byte.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("char.kt")
             public void testChar() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/char.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("double.kt")
             public void testDouble() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/double.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("float.kt")
             public void testFloat() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/float.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("genericNull.kt")
             public void testGenericNull() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/genericNull.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("int.kt")
             public void testInt() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/int.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("long.kt")
             public void testLong() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/long.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("null.kt")
             public void testNull() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/null.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("short.kt")
             public void testShort() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode/short.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Tostring extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInTostring() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -847,47 +1001,56 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("alreadyDeclared.kt")
             public void testAlreadyDeclared() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclared.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("alreadyDeclaredWrongSignature.kt")
             public void testAlreadyDeclaredWrongSignature() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyDeclaredWrongSignature.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("alreadyInherited.kt")
             public void testAlreadyInherited() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyInherited.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/alreadyInherited.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("arrayParams.kt")
             public void testArrayParams() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/arrayParams.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("changingVarParam.kt")
             public void testChangingVarParam() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/changingVarParam.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("genericParam.kt")
             public void testGenericParam() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/genericParam.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("mixedParams.kt")
             public void testMixedParams() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/mixedParams.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("overriddenProperty.kt")
             public void testOverriddenProperty() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/overriddenProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/overriddenProperty.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("unitComponent.kt")
             public void testUnitComponent() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring/unitComponent.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -904,6 +1067,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DefaultArguments.Constructor.class})
     public static class DefaultArguments extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInDefaultArguments() throws Exception {
@@ -911,6 +1075,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Constructor extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInConstructor() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -918,7 +1083,8 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("manyArgs.kt")
             public void testManyArgs() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor/manyArgs.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -932,6 +1098,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/evaluate")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Evaluate extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInEvaluate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/evaluate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -939,82 +1106,98 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("char.kt")
         public void testChar() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/char.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/char.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("divide.kt")
         public void testDivide() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/divide.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("infixCallBinary.kt")
         public void testInfixCallBinary() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/infixCallBinary.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("intrincics.kt")
         public void testIntrincics() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/intrincics.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("maxValue.kt")
         public void testMaxValue() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValue.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("maxValueByte.kt")
         public void testMaxValueByte() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueByte.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("maxValueInt.kt")
         public void testMaxValueInt() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/maxValueInt.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("miltiply.kt")
         public void testMiltiply() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/miltiply.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("minus.kt")
         public void testMinus() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/minus.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("mod.kt")
         public void testMod() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/mod.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("paranthesized.kt")
         public void testParanthesized() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/paranthesized.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("plus.kt")
         public void testPlus() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/plus.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("simpleCallBinary.kt")
         public void testSimpleCallBinary() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/simpleCallBinary.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("unaryMinus.kt")
         public void testUnaryMinus() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryMinus.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("unaryPlus.kt")
         public void testUnaryPlus() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/evaluate/unaryPlus.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({FullJdk.Synchronized.class})
     public static class FullJdk extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInFullJdk() throws Exception {
@@ -1023,45 +1206,54 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("classpath.kt")
         public void testClasspath() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("genericBackingFieldSignature.kt")
         public void testGenericBackingFieldSignature() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericBackingFieldSignature.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("genericMethodSignature.kt")
         public void testGenericMethodSignature() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/genericMethodSignature.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("ifInWhile.kt")
         public void testIfInWhile() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/ifInWhile.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("intCountDownLatchExtension.kt")
         public void testIntCountDownLatchExtension() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/intCountDownLatchExtension.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2423.kt")
         public void testKt2423() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2423.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2509.kt")
         public void testKt2509() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt2509.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt434.kt")
         public void testKt434() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/kt434.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Synchronized extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInSynchronized() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1069,52 +1261,62 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("changeMonitor.kt")
             public void testChangeMonitor() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/changeMonitor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/changeMonitor.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("exceptionInMonitorExpression.kt")
             public void testExceptionInMonitorExpression() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/exceptionInMonitorExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/exceptionInMonitorExpression.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("finally.kt")
             public void testFinally() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/finally.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/finally.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("longValue.kt")
             public void testLongValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/longValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/longValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nestedDifferentObjects.kt")
             public void testNestedDifferentObjects() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedDifferentObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedDifferentObjects.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nestedSameObject.kt")
             public void testNestedSameObject() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedSameObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/nestedSameObject.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("objectValue.kt")
             public void testObjectValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/objectValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/objectValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("sync.kt")
             public void testSync() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/sync.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/sync.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("value.kt")
             public void testValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/value.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/value.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("wait.kt")
             public void testWait() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/wait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized/wait.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -1128,6 +1330,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap")
+    @TestDataPath("$PROJECT_ROOT")
     public static class HashPMap extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInHashPMap() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/hashPMap"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1135,37 +1338,44 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("empty.kt")
         public void testEmpty() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/empty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/empty.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("manyNumbers.kt")
         public void testManyNumbers() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/manyNumbers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/manyNumbers.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("rewriteWithDifferent.kt")
         public void testRewriteWithDifferent() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithDifferent.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithDifferent.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("rewriteWithEqual.kt")
         public void testRewriteWithEqual() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithEqual.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/rewriteWithEqual.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("simplePlusGet.kt")
         public void testSimplePlusGet() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusGet.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusGet.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("simplePlusMinus.kt")
         public void testSimplePlusMinus() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap/simplePlusMinus.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class JdkAnnotations extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInJdkAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdkAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1173,27 +1383,32 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("arrayList.kt")
         public void testArrayList() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("iteratingOverHashMap.kt")
         public void testIteratingOverHashMap() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1397.kt")
         public void testKt1397() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/platformNames")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PlatformNames extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInPlatformNames() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1201,27 +1416,32 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("callableReference.kt")
         public void testCallableReference() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/callableReference.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("clashingErasure.kt")
         public void testClashingErasure() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/clashingErasure.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("functionName.kt")
         public void testFunctionName() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/functionName.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("propertyName.kt")
         public void testPropertyName() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/platformNames/propertyName.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Ranges.Expression.class, Ranges.Literal.class})
     public static class Ranges extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInRanges() throws Exception {
@@ -1230,15 +1450,18 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("forByteProgressionWithIntIncrement.kt")
         public void testForByteProgressionWithIntIncrement() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/forByteProgressionWithIntIncrement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/forByteProgressionWithIntIncrement.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("multiAssignmentIterationOverIntRange.kt")
         public void testMultiAssignmentIterationOverIntRange() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/multiAssignmentIterationOverIntRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/multiAssignmentIterationOverIntRange.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Expression extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInExpression() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1246,152 +1469,182 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("emptyDownto.kt")
             public void testEmptyDownto() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("emptyRange.kt")
             public void testEmptyRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactDownToMinValue.kt")
             public void testInexactDownToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactSteppedDownTo.kt")
             public void testInexactSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactSteppedRange.kt")
             public void testInexactSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactToMaxValue.kt")
             public void testInexactToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("infiniteSteps.kt")
             public void testInfiniteSteps() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/infiniteSteps.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueMinusTwoToMaxValue.kt")
             public void testMaxValueMinusTwoToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueToMaxValue.kt")
             public void testMaxValueToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueToMinValue.kt")
             public void testMaxValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nanEnds.kt")
             public void testNanEnds() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/nanEnds.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("oneElementDownTo.kt")
             public void testOneElementDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("oneElementRange.kt")
             public void testOneElementRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionDownToMinValue.kt")
             public void testProgressionDownToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt")
             public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueToMaxValue.kt")
             public void testProgressionMaxValueToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueToMinValue.kt")
             public void testProgressionMaxValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMinValueToMinValue.kt")
             public void testProgressionMinValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedBackSequence.kt")
             public void testReversedBackSequence() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedEmptyBackSequence.kt")
             public void testReversedEmptyBackSequence() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedEmptyRange.kt")
             public void testReversedEmptyRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedInexactSteppedDownTo.kt")
             public void testReversedInexactSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedRange.kt")
             public void testReversedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedSimpleSteppedRange.kt")
             public void testReversedSimpleSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleDownTo.kt")
             public void testSimpleDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleRange.kt")
             public void testSimpleRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleRangeWithNonConstantEnds.kt")
             public void testSimpleRangeWithNonConstantEnds() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleSteppedDownTo.kt")
             public void testSimpleSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleSteppedRange.kt")
             public void testSimpleSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Literal extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInLiteral() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1399,147 +1652,176 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("emptyDownto.kt")
             public void testEmptyDownto() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("emptyRange.kt")
             public void testEmptyRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactDownToMinValue.kt")
             public void testInexactDownToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactSteppedDownTo.kt")
             public void testInexactSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactSteppedRange.kt")
             public void testInexactSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("inexactToMaxValue.kt")
             public void testInexactToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("infiniteSteps.kt")
             public void testInfiniteSteps() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/infiniteSteps.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueMinusTwoToMaxValue.kt")
             public void testMaxValueMinusTwoToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueToMaxValue.kt")
             public void testMaxValueToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("maxValueToMinValue.kt")
             public void testMaxValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("nanEnds.kt")
             public void testNanEnds() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/nanEnds.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("oneElementDownTo.kt")
             public void testOneElementDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("oneElementRange.kt")
             public void testOneElementRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionDownToMinValue.kt")
             public void testProgressionDownToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueMinusTwoToMaxValue.kt")
             public void testProgressionMaxValueMinusTwoToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueToMaxValue.kt")
             public void testProgressionMaxValueToMaxValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMaxValueToMinValue.kt")
             public void testProgressionMaxValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("progressionMinValueToMinValue.kt")
             public void testProgressionMinValueToMinValue() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedBackSequence.kt")
             public void testReversedBackSequence() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedEmptyBackSequence.kt")
             public void testReversedEmptyBackSequence() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedEmptyRange.kt")
             public void testReversedEmptyRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedInexactSteppedDownTo.kt")
             public void testReversedInexactSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedRange.kt")
             public void testReversedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("reversedSimpleSteppedRange.kt")
             public void testReversedSimpleSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleDownTo.kt")
             public void testSimpleDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleRange.kt")
             public void testSimpleRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleRangeWithNonConstantEnds.kt")
             public void testSimpleRangeWithNonConstantEnds() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleSteppedDownTo.kt")
             public void testSimpleSteppedDownTo() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("simpleSteppedRange.kt")
             public void testSimpleSteppedRange() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -1554,6 +1836,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Reflection.Enclosing.class, Reflection.GenericSignature.class, Reflection.Mapping.class, Reflection.MethodsFromAny.class})
     public static class Reflection extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInReflection() throws Exception {
@@ -1561,6 +1844,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Enclosing.InsideLambda.class, Enclosing.Lambda.class})
         public static class Enclosing extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInEnclosing() throws Exception {
@@ -1568,6 +1852,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             }
             
             @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda")
+            @TestDataPath("$PROJECT_ROOT")
             public static class InsideLambda extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInInsideLambda() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1575,17 +1860,20 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 
                 @TestMetadata("classInLambda.kt")
                 public void testClassInLambda() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/classInLambda.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("objectInLambda.kt")
                 public void testObjectInLambda() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda/objectInLambda.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Lambda extends AbstractBlackBoxCodegenTest {
                 public void testAllFilesPresentInLambda() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1593,62 +1881,74 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
                 
                 @TestMetadata("lambdaInConstructor.kt")
                 public void testLambdaInConstructor() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInConstructor.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInFunction.kt")
                 public void testLambdaInFunction() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInFunction.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInLambda.kt")
                 public void testLambdaInLambda() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLambda.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInLocalClass.kt")
                 public void testLambdaInLocalClass() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLocalClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLocalClass.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInLocalFunction.kt")
                 public void testLambdaInLocalFunction() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLocalFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInLocalFunction.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInMemberFunction.kt")
                 public void testLambdaInMemberFunction() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunction.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInMemberFunctionInLocalClass.kt")
                 public void testLambdaInMemberFunctionInLocalClass() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunctionInLocalClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunctionInLocalClass.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInMemberFunctionInNestedClass.kt")
                 public void testLambdaInMemberFunctionInNestedClass() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunctionInNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInMemberFunctionInNestedClass.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInObjectExpression.kt")
                 public void testLambdaInObjectExpression() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInObjectExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInObjectExpression.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInPackage.kt")
                 public void testLambdaInPackage() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPackage.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInPropertyGetter.kt")
                 public void testLambdaInPropertyGetter() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertyGetter.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
                 @TestMetadata("lambdaInPropertySetter.kt")
                 public void testLambdaInPropertySetter() throws Exception {
-                    doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda/lambdaInPropertySetter.kt");
+                    doTestWithStdlib(fileName);
                 }
                 
             }
@@ -1663,6 +1963,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GenericSignature extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInGenericSignature() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1670,12 +1971,14 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("kt5112.kt")
             public void testKt5112() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Mapping extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInMapping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1683,27 +1986,32 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("extensionProperty.kt")
             public void testExtensionProperty() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/extensionProperty.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("memberProperty.kt")
             public void testMemberProperty() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/memberProperty.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("package.kt")
             public void testPackage() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/mapping/package.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/package.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("topLevelProperty.kt")
             public void testTopLevelProperty() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping/topLevelProperty.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny")
+        @TestDataPath("$PROJECT_ROOT")
         public static class MethodsFromAny extends AbstractBlackBoxCodegenTest {
             public void testAllFilesPresentInMethodsFromAny() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1711,37 +2019,44 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
             
             @TestMetadata("classToString.kt")
             public void testClassToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/classToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/classToString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("defaultPackageToString.kt")
             public void testDefaultPackageToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/defaultPackageToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/defaultPackageToString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("equalsHashCode.kt")
             public void testEqualsHashCode() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/equalsHashCode.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/equalsHashCode.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("extensionPropertyReceiverToString.kt")
             public void testExtensionPropertyReceiverToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/extensionPropertyReceiverToString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("packageForJavaStaticToString.kt")
             public void testPackageForJavaStaticToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/packageForJavaStaticToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/packageForJavaStaticToString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("packageToString.kt")
             public void testPackageToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/packageToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/packageToString.kt");
+                doTestWithStdlib(fileName);
             }
             
             @TestMetadata("propertyToString.kt")
             public void testPropertyToString() throws Exception {
-                doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny/propertyToString.kt");
+                doTestWithStdlib(fileName);
             }
             
         }
@@ -1758,6 +2073,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/regressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Regressions extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInRegressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/regressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1765,152 +2081,182 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("collections.kt")
         public void testCollections() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/collections.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/collections.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("generic.kt")
         public void testGeneric() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/generic.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/generic.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("getGenericInterfaces.kt")
         public void testGetGenericInterfaces() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/getGenericInterfaces.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1406.kt")
         public void testKt1406() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1406.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1406.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1568.kt")
         public void testKt1568() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1568.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1770.kt")
         public void testKt1770() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1770.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1770.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1779.kt")
         public void testKt1779() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1779.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1800.kt")
         public void testKt1800() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1800.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt1932.kt")
         public void testKt1932() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt1932.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2017.kt")
         public void testKt2017() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt2017.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2017.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2210.kt")
         public void testKt2210() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2210.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2246.kt")
         public void testKt2246() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2246.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2318.kt")
         public void testKt2318() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2318.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt2593.kt")
         public void testKt2593() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt2593.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt274.kt")
         public void testKt274() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt274.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt274.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt3046.kt")
         public void testKt3046() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt3046.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt344.kt")
         public void testKt344() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt344.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt4262.kt")
         public void testKt4262() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt4262.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt5056.kt")
         public void testKt5056() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt5056.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5056.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt528.kt")
         public void testKt528() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt528.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt529.kt")
         public void testKt529() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt529.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt533.kt")
         public void testKt533() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt533.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt5609.kt")
         public void testKt5609() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt5609.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt5609.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt715.kt")
         public void testKt715() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt715.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt789.kt")
         public void testKt789() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt789.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt864.kt")
         public void testKt864() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/kt864.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/kt864.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("objectCaptureOuterConstructorProperty.kt")
         public void testObjectCaptureOuterConstructorProperty() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/objectCaptureOuterConstructorProperty.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("referenceToSelfInLocal.kt")
         public void testReferenceToSelfInLocal() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/referenceToSelfInLocal.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("typeCastException.kt")
         public void testTypeCastException() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/regressions/typeCastException.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/strings")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Strings extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInStrings() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/strings"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1918,17 +2264,20 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("forInString.kt")
         public void testForInString() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/strings/forInString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/forInString.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("stringPlusOnlyWorksOnString.kt")
         public void testStringPlusOnlyWorksOnString() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/strings/stringPlusOnlyWorksOnString.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/toArray")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ToArray extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInToArray() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/toArray"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1936,22 +2285,26 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("copyToArray.kt")
         public void testCopyToArray() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/toArray/copyToArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/copyToArray.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("kt3177-copyToArray.kt")
         public void testKt3177_copyToArray() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/toArray/kt3177-copyToArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/kt3177-copyToArray.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("returnCopyToArray.kt")
         public void testReturnCopyToArray() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/toArray/returnCopyToArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/toArray/returnCopyToArray.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/vararg")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Vararg extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInVararg() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1959,12 +2312,14 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("varargInFunParam.kt")
         public void testVarargInFunParam() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/vararg/varargInFunParam.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1972,42 +2327,50 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("integralWhenWithNoInlinedConstants.kt")
         public void testIntegralWhenWithNoInlinedConstants() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/integralWhenWithNoInlinedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/integralWhenWithNoInlinedConstants.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationDense.kt")
         public void testSwitchOptimizationDense() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationDense.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationDense.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationMultipleConditions.kt")
         public void testSwitchOptimizationMultipleConditions() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationMultipleConditions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationMultipleConditions.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationSparse.kt")
         public void testSwitchOptimizationSparse() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationSparse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationSparse.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationStatement.kt")
         public void testSwitchOptimizationStatement() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationStatement.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationTypes.kt")
         public void testSwitchOptimizationTypes() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("switchOptimizationUnordered.kt")
         public void testSwitchOptimizationUnordered() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationUnordered.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/when/switchOptimizationUnordered.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenEnumOptimization extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInWhenEnumOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2015,57 +2378,68 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("bigEnum.kt")
         public void testBigEnum() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/bigEnum.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/duplicatingItems.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("enumInsideClassObject.kt")
         public void testEnumInsideClassObject() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/enumInsideClassObject.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/expression.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("functionLiteralInTopLevel.kt")
         public void testFunctionLiteralInTopLevel() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/functionLiteralInTopLevel.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("manyWhensWithinClass.kt")
         public void testManyWhensWithinClass() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/manyWhensWithinClass.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("nonConstantEnum.kt")
         public void testNonConstantEnum() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nonConstantEnum.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/nullability.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("subjectAny.kt")
         public void testSubjectAny() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/subjectAny.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("withoutElse.kt")
         public void testWithoutElse() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization/withoutElse.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhenStringOptimization extends AbstractBlackBoxCodegenTest {
         public void testAllFilesPresentInWhenStringOptimization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2073,32 +2447,38 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode
         
         @TestMetadata("duplicatingItems.kt")
         public void testDuplicatingItems() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItems.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItems.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("duplicatingItemsSameHashCode.kt")
         public void testDuplicatingItemsSameHashCode() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/duplicatingItemsSameHashCode.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("expression.kt")
         public void testExpression() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/expression.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/expression.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("nullability.kt")
         public void testNullability() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/nullability.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("sameHashCode.kt")
         public void testSameHashCode() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/sameHashCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/sameHashCode.kt");
+            doTestWithStdlib(fileName);
         }
         
         @TestMetadata("statement.kt")
         public void testStatement() throws Exception {
-            doTestWithStdlib("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/statement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization/statement.kt");
+            doTestWithStdlib(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java b/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java
index 5c0d74054c3..3c5722c7dc4 100644
--- a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({EvaluateExpressionTestGenerated.Constant.class, EvaluateExpressionTestGenerated.IsPure.class, EvaluateExpressionTestGenerated.UsesVariableAsConstant.class})
 public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest {
     @TestMetadata("compiler/testData/evaluate/constant")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constant extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,102 +39,122 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("classObjectProperty.kt")
         public void testClassObjectProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/classObjectProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/classObjectProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("compareTo.kt")
         public void testCompareTo() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/compareTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/compareTo.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("differentTypes.kt")
         public void testDifferentTypes() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/differentTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/differentTypes.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("divideByZero.kt")
         public void testDivideByZero() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/divideByZero.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/divideByZero.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/equals.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("exceptionWhenEvaluate.kt")
         public void testExceptionWhenEvaluate() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/exceptionWhenEvaluate.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("finalProperty.kt")
         public void testFinalProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/finalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/finalProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("float.kt")
         public void testFloat() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/float.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/float.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("floatsAndDoubles.kt")
         public void testFloatsAndDoubles() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/floatsAndDoubles.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/floatsAndDoubles.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("integer.kt")
         public void testInteger() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/integer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integer.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("integers.kt")
         public void testIntegers() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/integers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/integers.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("localVal.kt")
         public void testLocalVal() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/localVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVal.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("localVar.kt")
         public void testLocalVar() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/localVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/localVar.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("nonFinalProperty.kt")
         public void testNonFinalProperty() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/nonFinalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/nonFinalProperty.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("strings.kt")
         public void testStrings() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/strings.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/strings.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("topLevelVal.kt")
         public void testTopLevelVal() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/topLevelVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVal.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("topLevelVar.kt")
         public void testTopLevelVar() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/topLevelVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/topLevelVar.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndepWoExpType.kt")
         public void testUnaryMinusIndepWoExpType() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt");
+            doConstantTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndependentExpType.kt")
         public void testUnaryMinusIndependentExpType() throws Exception {
-            doConstantTest("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt");
+            doConstantTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/evaluate/isPure")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IsPure extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInIsPure() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,32 +162,38 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("innerToType.kt")
         public void testInnerToType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/innerToType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/innerToType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("namedConstants.kt")
         public void testNamedConstants() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/namedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/namedConstants.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("toType.kt")
         public void testToType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/toType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/toType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndepWoExpType.kt")
         public void testUnaryMinusIndepWoExpType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndepWoExpType.kt");
+            doIsPureTest(fileName);
         }
         
         @TestMetadata("unaryMinusIndependentExpType.kt")
         public void testUnaryMinusIndependentExpType() throws Exception {
-            doIsPureTest("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/isPure/unaryMinusIndependentExpType.kt");
+            doIsPureTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/evaluate/usesVariableAsConstant")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UsesVariableAsConstant extends AbstractEvaluateExpressionTest {
         public void testAllFilesPresentInUsesVariableAsConstant() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -173,22 +201,26 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT
         
         @TestMetadata("binaryTypes.kt")
         public void testBinaryTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/binaryTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("NamedConstants.kt")
         public void testNamedConstants() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/NamedConstants.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("OtherTypes.kt")
         public void testOtherTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/OtherTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
         @TestMetadata("simpleTypes.kt")
         public void testSimpleTypes() throws Exception {
-            doUsesVariableAsConstantTest("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/evaluate/usesVariableAsConstant/simpleTypes.kt");
+            doUsesVariableAsConstantTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
index 98749f9f055..b154da3993d 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/compileJavaAgainstKotlin")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({CompileJavaAgainstKotlinTestGenerated.Class.class, CompileJavaAgainstKotlinTestGenerated.Method.class, CompileJavaAgainstKotlinTestGenerated.Property.class, CompileJavaAgainstKotlinTestGenerated.StaticFields.class})
 public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest {
     public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception {
@@ -35,6 +37,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Class extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -42,72 +45,86 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultConstructor.kt")
         public void testDefaultConstructor() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultConstructorWithTwoArgs.kt")
         public void testDefaultConstructorWithTwoArgs() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/DefaultConstructorWithTwoArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendsAbstractListT.kt")
         public void testExtendsAbstractListT() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ExtendsAbstractListT.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ImplementsListString.kt")
         public void testImplementsListString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsListString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ImplementsMapPP.kt")
         public void testImplementsMapPP() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/ImplementsMapPP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClass.kt")
         public void testInnerClass() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassConstructors.kt")
         public void testInnerClassConstructors() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassConstructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassOfGeneric.kt")
         public void testInnerClassOfGeneric() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/InnerClassOfGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3561.kt")
         public void testKt3561() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt3561.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt4050.kt")
         public void testKt4050() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/kt4050.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/class/Simple.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Method.PlatformName.class, Method.PrimitiveOverride.class, Method.Throws.class})
     public static class Method extends AbstractCompileJavaAgainstKotlinTest {
         @TestMetadata("AccessorGenericSignature.kt")
         public void testAccessorGenericSignature() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/AccessorGenericSignature.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInMethod() throws Exception {
@@ -116,120 +133,144 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("Any.kt")
         public void testAny() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Any.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfIntArray.kt")
         public void testArrayOfIntArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfIntegerArray.kt")
         public void testArrayOfIntegerArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ArrayOfIntegerArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClashingSignaturesWithoutReturnType.kt")
         public void testClashingSignaturesWithoutReturnType() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ClashingSignaturesWithoutReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DefaultMethod.kt")
         public void testDefaultMethod() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/DefaultMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Delegation.kt")
         public void testDelegation() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Delegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Extensions.kt")
         public void testExtensions() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Extensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericArray.kt")
         public void testGenericArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/GenericArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Hello.kt")
         public void testHello() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Hello.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Int.kt")
         public void testInt() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Int.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntArray.kt")
         public void testIntArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntWithDefault.kt")
         public void testIntWithDefault() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntWithDefault.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntegerArray.kt")
         public void testIntegerArray() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/IntegerArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfInt.kt")
         public void testListOfInt() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfString.kt")
         public void testListOfString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfT.kt")
         public void testListOfT() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/ListOfT.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapOfKString.kt")
         public void testMapOfKString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfKString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MapOfStringIntQ.kt")
         public void testMapOfStringIntQ() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/MapOfStringIntQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QExtendsListString.kt")
         public void testQExtendsListString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsListString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QExtendsString.kt")
         public void testQExtendsString() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/QExtendsString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitImpl.kt")
         public void testTraitImpl() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/TraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Vararg.kt")
         public void testVararg() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Vararg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Void.kt")
         public void testVoid() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/Void.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPlatformName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -237,12 +278,14 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("PlatformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName/PlatformName.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PrimitiveOverride extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPrimitiveOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -250,62 +293,74 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("ByteOverridesObject.kt")
             public void testByteOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ByteOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CallFinalNotInSubclass.kt")
             public void testCallFinalNotInSubclass() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallFinalNotInSubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CallNotInSubclass.kt")
             public void testCallNotInSubclass() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CallNotInSubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CovariantReturnTypeOverride.kt")
             public void testCovariantReturnTypeOverride() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/CovariantReturnTypeOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FinalOverride.kt")
             public void testFinalOverride() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/FinalOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesComparable.kt")
             public void testIntOverridesComparable() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesComparable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesNumber.kt")
             public void testIntOverridesNumber() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesNumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntOverridesObject.kt")
             public void testIntOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/IntOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ManyClassesHierarchy.kt")
             public void testManyClassesHierarchy() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/ManyClassesHierarchy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NullableIntOverridesObject.kt")
             public void testNullableIntOverridesObject() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/NullableIntOverridesObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideInJava.kt")
             public void testOverrideInJava() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride/OverrideInJava.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Throws extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInThrows() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -313,37 +368,44 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("ClassMembers.kt")
             public void testClassMembers() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/ClassMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constructor.kt")
             public void testConstructor() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Constructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DefaultArgs.kt")
             public void testDefaultArgs() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/Delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("GenericSubstitution.kt")
             public void testGenericSubstitution() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/GenericSubstitution.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevel.kt")
             public void testTopLevel() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitMembers.kt")
             public void testTraitMembers() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws/TraitMembers.kt");
+                doTest(fileName);
             }
             
         }
@@ -359,6 +421,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Property.PlatformName.class})
     public static class Property extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInProperty() throws Exception {
@@ -367,15 +430,18 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("Extensions.kt")
         public void testExtensions() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/Extensions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericProperty.kt")
         public void testGenericProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/GenericProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest {
             public void testAllFilesPresentInPlatformName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -383,7 +449,8 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
             
             @TestMetadata("PlatformName.kt")
             public void testPlatformName() throws Exception {
-                doTest("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName/PlatformName.kt");
+                doTest(fileName);
             }
             
         }
@@ -397,6 +464,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
     }
     
     @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StaticFields extends AbstractCompileJavaAgainstKotlinTest {
         public void testAllFilesPresentInStaticFields() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -404,27 +472,32 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg
         
         @TestMetadata("AnnotationClass.kt")
         public void testAnnotationClass() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AnnotationTrait.kt")
         public void testAnnotationTrait() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt3698.kt")
         public void testKt3698() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/kt3698.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticClassProperty.kt")
         public void testStaticClassProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticClassProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticTraitProperty.kt")
         public void testStaticTraitProperty() throws Exception {
-            doTest("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
index a5c2c5d55df..562578bf894 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/boxInline")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({CompileKotlinAgainstInlineKotlinTestGenerated.AnonymousObject.class, CompileKotlinAgainstInlineKotlinTestGenerated.Builders.class, CompileKotlinAgainstInlineKotlinTestGenerated.Capture.class, CompileKotlinAgainstInlineKotlinTestGenerated.Complex.class, CompileKotlinAgainstInlineKotlinTestGenerated.DefaultValues.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaClassClash.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaTransformation.class, CompileKotlinAgainstInlineKotlinTestGenerated.LocalFunInLambda.class, CompileKotlinAgainstInlineKotlinTestGenerated.NoInline.class, CompileKotlinAgainstInlineKotlinTestGenerated.NonLocalReturns.class, CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class, CompileKotlinAgainstInlineKotlinTestGenerated.Special.class, CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class, CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class})
 public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
     public void testAllFilesPresentInBoxInline() throws Exception {
@@ -35,6 +37,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AnonymousObject extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInAnonymousObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -42,27 +45,32 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("anonymousObjectOnCallSite.1.kt")
         public void testAnonymousObjectOnCallSite() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSite.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnCallSiteSuperParams.1.kt")
         public void testAnonymousObjectOnCallSiteSuperParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnCallSiteSuperParams.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSite.1.kt")
         public void testAnonymousObjectOnDeclarationSite() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSite.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("anonymousObjectOnDeclarationSiteSuperParams.1.kt")
         public void testAnonymousObjectOnDeclarationSiteSuperParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/anonymousObject/anonymousObjectOnDeclarationSiteSuperParams.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/builders")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Builders extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInBuilders() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -70,17 +78,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("builders.1.kt")
         public void testBuilders() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/builders.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("buildersAndLambdaCapturing.1.kt")
         public void testBuildersAndLambdaCapturing() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/builders/buildersAndLambdaCapturing.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/capture")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Capture extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInCapture() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -88,37 +99,44 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("captureInlinable.1.kt")
         public void testCaptureInlinable() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinable.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureInlinableAndOther.1.kt")
         public void testCaptureInlinableAndOther() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureInlinableAndOther.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("captureThisAndReceiver.1.kt")
         public void testCaptureThisAndReceiver() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/captureThisAndReceiver.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("generics.1.kt")
         public void testGenerics() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/generics.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInClass.1.kt")
         public void testSimpleCapturingInClass() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInClass.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleCapturingInPackage.1.kt")
         public void testSimpleCapturingInPackage() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/complex")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Complex extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInComplex() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -126,32 +144,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("closureChain.1.kt")
         public void testClosureChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/closureChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("forEachLine.1.kt")
         public void testForEachLine() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/forEachLine.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda.1.kt")
         public void testLambdaInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/lambdaInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("use.1.kt")
         public void testUse() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/use.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("with.1.kt")
         public void testWith() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/complex/with.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/defaultValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DefaultValues extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInDefaultValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -159,32 +183,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("defaultInExtension.1.kt")
         public void testDefaultInExtension() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethod.1.kt")
         public void testDefaultMethod() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethod.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("defaultMethodInClass.1.kt")
         public void testDefaultMethodInClass() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineInDefaultParameter.1.kt")
         public void testInlineInDefaultParameter() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/inlineInDefaultParameter.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDefaultMethod.1.kt")
         public void testSimpleDefaultMethod() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/defaultValues/simpleDefaultMethod.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaClassClash extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLambdaClassClash() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -192,17 +222,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("lambdaClassClash.1.kt")
         public void testLambdaClassClash() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/lambdaClassClash.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaX2.1.kt")
         public void testNoInlineLambdaX2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaClassClash/noInlineLambdaX2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LambdaTransformation extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLambdaTransformation() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -210,32 +243,38 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("lambdaCloning.1.kt")
         public void testLambdaCloning() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaCloning.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambda2.1.kt")
         public void testLambdaInLambda2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambda2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("lambdaInLambdaNoInline.1.kt")
         public void testLambdaInLambdaNoInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/lambdaInLambdaNoInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("regeneratedLambdaName.1.kt")
         public void testRegeneratedLambdaName() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/regeneratedLambdaName.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("sameCaptured.1.kt")
         public void testSameCaptured() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/lambdaTransformation/sameCaptured.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalFunInLambda extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInLocalFunInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -243,12 +282,14 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("localFunInLambda.1.kt")
         public void testLocalFunInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/localFunInLambda/localFunInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/noInline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NoInline extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInNoInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -256,27 +297,32 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("noInline.1.kt")
         public void testNoInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChain.1.kt")
         public void testNoInlineLambdaChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLambdaChainWithCapturedInline.1.kt")
         public void testNoInlineLambdaChainWithCapturedInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/noInlineLambdaChainWithCapturedInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("withoutInline.1.kt")
         public void testWithoutInline() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class})
     public static class NonLocalReturns extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -285,40 +331,48 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("explicitLocalReturn.1.kt")
         public void testExplicitLocalReturn() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("justReturnInLambda.1.kt")
         public void testJustReturnInLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/justReturnInLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("nestedNonLocals.1.kt")
         public void testNestedNonLocals() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("noInlineLocalReturn.1.kt")
         public void testNoInlineLocalReturn() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("propertyAccessors.1.kt")
         public void testPropertyAccessors() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/propertyAccessors.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simple.1.kt")
         public void testSimple() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simple.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleVoid.1.kt")
         public void testSimpleVoid() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/simpleVoid.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Deparenthesize extends AbstractCompileKotlinAgainstKotlinTest {
             public void testAllFilesPresentInDeparenthesize() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -326,17 +380,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             
             @TestMetadata("bracket.1.kt")
             public void testBracket() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
             @TestMetadata("labeled.1.kt")
             public void testLabeled() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TryFinally extends AbstractCompileKotlinAgainstKotlinTest {
             public void testAllFilesPresentInTryFinally() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -344,7 +401,8 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
             
             @TestMetadata("external.1.kt")
             public void testExternal() throws Exception {
-                doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/external.1.kt");
+                doBoxTestWithInlineCheck(fileName);
             }
             
         }
@@ -359,6 +417,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/simple")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Simple extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInSimple() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -366,72 +425,86 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("classObject.1.kt")
         public void testClassObject() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/classObject.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("extension.1.kt")
         public void testExtension() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/extension.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("params.1.kt")
         public void testParams() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/params.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("rootConstructor.1.kt")
         public void testRootConstructor() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/rootConstructor.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalClosures.1.kt")
         public void testSeveralClosures() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalClosures.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("severalUsage.1.kt")
         public void testSeveralUsage() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/severalUsage.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleDouble.1.kt")
         public void testSimpleDouble() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleEnum.1.kt")
         public void testSimpleEnum() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleEnum.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleGenerics.1.kt")
         public void testSimpleGenerics() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleGenerics.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleInt.1.kt")
         public void testSimpleInt() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleInt.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleLambda.1.kt")
         public void testSimpleLambda() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleLambda.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("simpleObject.1.kt")
         public void testSimpleObject() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/simpleObject.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("vararg.1.kt")
         public void testVararg() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/simple/vararg.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/special")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Special extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInSpecial() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -439,37 +512,44 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("identityCheck.1.kt")
         public void testIdentityCheck() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/identityCheck.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("ifBranches.1.kt")
         public void testIfBranches() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/ifBranches.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("iinc.1.kt")
         public void testIinc() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/iinc.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("inlineChain.1.kt")
         public void testInlineChain() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/inlineChain.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("plusAssign.1.kt")
         public void testPlusAssign() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/plusAssign.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("stackHeightBug.1.kt")
         public void testStackHeightBug() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/special/stackHeightBug.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/trait")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Trait extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInTrait() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -477,12 +557,14 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("trait.1.kt")
         public void testTrait() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/trait/trait.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatchFinally extends AbstractCompileKotlinAgainstKotlinTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true);
@@ -490,17 +572,20 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi
         
         @TestMetadata("tryCatch.1.kt")
         public void testTryCatch() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatch2.1.kt")
         public void testTryCatch2() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
         @TestMetadata("tryCatchFinally.1.kt")
         public void testTryCatchFinally() throws Exception {
-            doBoxTestWithInlineCheck("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt");
+            doBoxTestWithInlineCheck(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
index fff1360999d..dac046a390e 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/compileKotlinAgainstKotlin")
+@TestDataPath("$PROJECT_ROOT")
 public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest {
     public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true);
@@ -35,87 +37,104 @@ public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotl
     
     @TestMetadata("ClassInObject.A.kt")
     public void testClassInObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassInObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMember.A.kt")
     public void testClassObjectMember() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ClassObjectMember.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorVararg.A.kt")
     public void testConstructorVararg() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ConstructorVararg.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DefaultConstructor.A.kt")
     public void testDefaultConstructor() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DefaultConstructor.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DoublyNestedClass.A.kt")
     public void testDoublyNestedClass() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/DoublyNestedClass.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Enum.A.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Enum.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportObject.A.kt")
     public void testImportObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/ImportObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InlinedConstants.A.kt")
     public void testInlinedConstants() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InlinedConstants.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InnerClassConstructor.A.kt")
     public void testInnerClassConstructor() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/InnerClassConstructor.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KotlinPropertyAsAnnotationParameter.A.kt")
     public void testKotlinPropertyAsAnnotationParameter() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/KotlinPropertyAsAnnotationParameter.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedClass.A.kt")
     public void testNestedClass() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedClass.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedEnum.A.kt")
     public void testNestedEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedEnum.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObject.A.kt")
     public void testNestedObject() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/NestedObject.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PlatformNames.A.kt")
     public void testPlatformNames() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PlatformNames.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyReference.A.kt")
     public void testPropertyReference() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/PropertyReference.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Simple.A.kt")
     public void testSimple() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/Simple.A.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("StarImportEnum.A.kt")
     public void testStarImportEnum() throws Exception {
-        doTest("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/compileKotlinAgainstKotlin/StarImportEnum.A.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
index f8c238dc3ac..c5da610b9f7 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({LoadJavaTestGenerated.CompiledJava.class, LoadJavaTestGenerated.CompiledJavaAndKotlin.class, LoadJavaTestGenerated.CompiledJavaIncludeObjectMethods.class, LoadJavaTestGenerated.CompiledKotlin.class, LoadJavaTestGenerated.CompiledKotlinWithStdlib.class, LoadJavaTestGenerated.JavaAgainstKotlin.class, LoadJavaTestGenerated.KotlinAgainstCompiledJavaWithKotlin.class, LoadJavaTestGenerated.SourceJava.class})
 public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     @TestMetadata("compiler/testData/loadJava/compiledJava")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.Constructor.class, CompiledJava.JavaBean.class, CompiledJava.KotlinSignature.class, CompiledJava.Library.class, CompiledJava.Modality.class, CompiledJava.Mutability.class, CompiledJava.NotNull.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.Sam.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class, CompiledJava.Vararg.class})
     public static class CompiledJava extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledJava() throws Exception {
@@ -38,215 +40,258 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         
         @TestMetadata("ArrayTypeVariance.java")
         public void testArrayTypeVariance() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ArrayTypeVariance.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassDoesNotOverrideMethod.java")
         public void testClassDoesNotOverrideMethod() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithConstVal.java")
         public void testClassWithConstVal() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithConstVal.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypeP.java")
         public void testClassWithTypeP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypeP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypePExtendsIterableP.java")
         public void testClassWithTypePExtendsIterableP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypePP.java")
         public void testClassWithTypePP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefNext.java")
         public void testClassWithTypePRefNext() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefSelf.java")
         public void testClassWithTypePRefSelf() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefSelfAndClass.java")
         public void testClassWithTypePRefSelfAndClass() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("EnumMembers.java")
         public void testEnumMembers() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/EnumMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/EnumMembers.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("FieldAsVar.java")
         public void testFieldAsVar() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/FieldAsVar.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldAsVar.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("FieldOfArrayType.java")
         public void testFieldOfArrayType() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FieldOfArrayType.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("FinalFieldAsVal.java")
         public void testFinalFieldAsVal() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/FinalFieldAsVal.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InheritMethodsDifferentReturnTypes.java")
         public void testInheritMethodsDifferentReturnTypes() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.java")
         public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InnerClass.java")
         public void testInnerClass() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InnerClass.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClass.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InnerClassReferencesOuterTP.java")
         public void testInnerClassReferencesOuterTP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InnerClassesInGeneric.java")
         public void testInnerClassesInGeneric() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("InnerOfGeneric.java")
         public void testInnerOfGeneric() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/InnerOfGeneric.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("JavaEnum.java")
         public void testJavaEnum() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/JavaEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/JavaEnum.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodReferencesOuterClassTP.java")
         public void testMethodReferencesOuterClassTP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodTypePOneUpperBound.java")
         public void testMethodTypePOneUpperBound() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodTypePTwoUpperBounds.java")
         public void testMethodTypePTwoUpperBounds() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodWithTypeP.java")
         public void testMethodWithTypeP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypeP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodWithTypePP.java")
         public void testMethodWithTypePP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethodWithTypePRefClassP.java")
         public void testMethodWithTypePRefClassP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MethosWithPRefTP.java")
         public void testMethosWithPRefTP() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MethosWithPRefTP.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("MyException.java")
         public void testMyException() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/MyException.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/MyException.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("NestedClass.java")
         public void testNestedClass() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/NestedClass.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/NestedClass.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("OverrideMethod.java")
         public void testOverrideMethod() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/OverrideMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/OverrideMethod.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("PackageLocalVisibility.java")
         public void testPackageLocalVisibility() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PackageLocalVisibility.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("PrivateMembers.java")
         public void testPrivateMembers() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/PrivateMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembers.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("PrivateMembersInHierarchy.java")
         public void testPrivateMembersInHierarchy() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("RawTypeWithUpperBound.java")
         public void testRawTypeWithUpperBound() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawTypeWithUpperBound.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("RawUpperBound.java")
         public void testRawUpperBound() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/RawUpperBound.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RawUpperBound.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("RecursiveRawUpperBound.java")
         public void testRecursiveRawUpperBound() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveRawUpperBound.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("RecursiveWildcardUpperBound.java")
         public void testRecursiveWildcardUpperBound() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RecursiveWildcardUpperBound.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("RemoveRedundantProjectionKind.java")
         public void testRemoveRedundantProjectionKind() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/RemoveRedundantProjectionKind.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("Simple.java")
         public void testSimple() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/Simple.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/Simple.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("SubclassFromNested.java")
         public void testSubclassFromNested() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/SubclassFromNested.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/SubclassFromNested.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("TwoFields.java")
         public void testTwoFields() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/TwoFields.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/TwoFields.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("UnboundWildcard.java")
         public void testUnboundWildcard() throws Exception {
-            doTestCompiledJava("compiler/testData/loadJava/compiledJava/UnboundWildcard.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/UnboundWildcard.java");
+            doTestCompiledJava(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/annotations")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Annotations extends AbstractLoadJavaTest {
             public void testAllFilesPresentInAnnotations() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true);
@@ -254,102 +299,122 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("AnnotatedAnnotation.java")
             public void testAnnotatedAnnotation() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedAnnotation.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("AnnotatedMethod.java")
             public void testAnnotatedMethod() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("AnnotationInParam.java")
             public void testAnnotationInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/AnnotationInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ArithmeticExpressionInParam.java")
             public void testArithmeticExpressionInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ArrayOfEnumInParam.java")
             public void testArrayOfEnumInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfEnumInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ArrayOfStringInParam.java")
             public void testArrayOfStringInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ArrayOfStringInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ClassObjectArrayInParam.java")
             public void testClassObjectArrayInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ClassObjectInParam.java")
             public void testClassObjectInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("CustomAnnotation.java")
             public void testCustomAnnotation() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotation.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("CustomAnnotationWithDefaultParameter.java")
             public void testCustomAnnotationWithDefaultParameter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/CustomAnnotationWithDefaultParameter.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("EmptyArrayInParam.java")
             public void testEmptyArrayInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EmptyArrayInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("EnumInParam.java")
             public void testEnumInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/EnumInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("PrimitiveValueInParam.java")
             public void testPrimitiveValueInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/PrimitiveValueInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("RecursiveAnnotation.java")
             public void testRecursiveAnnotation() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("RecursiveAnnotation2.java")
             public void testRecursiveAnnotation2() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/RecursiveAnnotation2.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SimpleAnnotation.java")
             public void testSimpleAnnotation() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/SimpleAnnotation.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StringConcatenationInParam.java")
             public void testStringConcatenationInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConcatenationInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StringConstantInParam.java")
             public void testStringConstantInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringConstantInParam.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StringInParam.java")
             public void testStringInParam() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/annotations/StringInParam.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/constructor")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Constructor extends AbstractLoadJavaTest {
             public void testAllFilesPresentInConstructor() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true);
@@ -357,22 +422,26 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ConstructorGenericDeep.java")
             public void testConstructorGenericDeep() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericDeep.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorGenericSimple.java")
             public void testConstructorGenericSimple() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericSimple.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorGenericUpperBound.java")
             public void testConstructorGenericUpperBound() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/constructor/ConstructorGenericUpperBound.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/javaBean")
+        @TestDataPath("$PROJECT_ROOT")
         public static class JavaBean extends AbstractLoadJavaTest {
             public void testAllFilesPresentInJavaBean() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true);
@@ -380,42 +449,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("DifferentGetterAndSetter.java")
             public void testDifferentGetterAndSetter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("JavaBeanAbstractGetter.java")
             public void testJavaBeanAbstractGetter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanAbstractGetter.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("JavaBeanVal.java")
             public void testJavaBeanVal() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("JavaBeanVar.java")
             public void testJavaBeanVar() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("JavaBeanVarOfGenericType.java")
             public void testJavaBeanVarOfGenericType() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("TwoSetters.java")
             public void testTwoSetters() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
         public static class KotlinSignature extends AbstractLoadJavaTest {
             @TestMetadata("AllBoundsInWhen.java")
             public void testAllBoundsInWhen() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.java");
+                doTestCompiledJava(fileName);
             }
             
             public void testAllFilesPresentInKotlinSignature() throws Exception {
@@ -424,84 +501,101 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ArrayType.java")
             public void testArrayType() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorWithNewTypeParams.java")
             public void testConstructorWithNewTypeParams() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithNewTypeParams.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorWithParentTypeParams.java")
             public void testConstructorWithParentTypeParams() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithParentTypeParams.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorWithSeveralParams.java")
             public void testConstructorWithSeveralParams() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithSeveralParams.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ConstructorWithoutParams.java")
             public void testConstructorWithoutParams() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/ConstructorWithoutParams.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("CustomProjectionKind.java")
             public void testCustomProjectionKind() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodWithFunctionTypes.java")
             public void testMethodWithFunctionTypes() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodWithGenerics.java")
             public void testMethodWithGenerics() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodWithMappedClasses.java")
             public void testMethodWithMappedClasses() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodWithTypeParameters.java")
             public void testMethodWithTypeParameters() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodWithVararg.java")
             public void testMethodWithVararg() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("PropertyArrayTypes.java")
             public void testPropertyArrayTypes() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("PropertyComplexTypes.java")
             public void testPropertyComplexTypes() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("PropertySimpleType.java")
             public void testPropertySimpleType() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StarProjection.java")
             public void testStarProjection() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Error extends AbstractLoadJavaTest {
                 @TestMetadata("AddingNullability.java")
                 public void testAddingNullability() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 public void testAllFilesPresentInError() throws Exception {
@@ -510,137 +604,164 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ConflictingProjectionKind.java")
                 public void testConflictingProjectionKind() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("ExplicitFieldGettersAndSetters.java")
                 public void testExplicitFieldGettersAndSetters() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("ExtraUpperBound.java")
                 public void testExtraUpperBound() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("MissingUpperBound.java")
                 public void testMissingUpperBound() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("NoFieldTypeRef.java")
                 public void testNoFieldTypeRef() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("NotVarargReplacedWithVararg.java")
                 public void testNotVarargReplacedWithVararg() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("RedundantProjectionKind.java")
                 public void testRedundantProjectionKind() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeMissing.java")
                 public void testReturnTypeMissing() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("SyntaxError.java")
                 public void testSyntaxError() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("SyntaxErrorInFieldAnnotation.java")
                 public void testSyntaxErrorInFieldAnnotation() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("VarargReplacedWithNotVararg.java")
                 public void testVarargReplacedWithNotVararg() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongFieldInitializer.java")
                 public void testWrongFieldInitializer() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongFieldMutability.java")
                 public void testWrongFieldMutability() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongFieldName.java")
                 public void testWrongFieldName() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongMethodName.java")
                 public void testWrongMethodName() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongProjectionKind.java")
                 public void testWrongProjectionKind() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongReturnTypeStructure.java")
                 public void testWrongReturnTypeStructure() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName1.java")
                 public void testWrongTypeName1() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName2.java")
                 public void testWrongTypeName2() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName3.java")
                 public void testWrongTypeName3() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure1.java")
                 public void testWrongTypeParameterBoundStructure1() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure2.java")
                 public void testWrongTypeParameterBoundStructure2() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParametersCount.java")
                 public void testWrongTypeParametersCount() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongValueParameterStructure1.java")
                 public void testWrongValueParameterStructure1() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongValueParameterStructure2.java")
                 public void testWrongValueParameterStructure2() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("WrongValueParametersCount.java")
                 public void testWrongValueParametersCount() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java");
+                    doTestCompiledJava(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
             public static class Propagation extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInPropagation() throws Exception {
@@ -649,10 +770,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("PropagateTypeArgumentNullable.java")
                 public void testPropagateTypeArgumentNullable() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Parameter extends AbstractLoadJavaTest {
                     public void testAllFilesPresentInParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true);
@@ -660,166 +783,199 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("ChangeProjectionKind1.java")
                     public void testChangeProjectionKind1() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("ChangeProjectionKind2.java")
                     public void testChangeProjectionKind2() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter.java")
                     public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter2.java")
                     public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritMutability.java")
                     public void testInheritMutability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNotVararg.java")
                     public void testInheritNotVararg() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVararg.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargInteger.java")
                     public void testInheritNotVarargInteger() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargNotNull.java")
                     public void testInheritNotVarargNotNull() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargPrimitive.java")
                     public void testInheritNotVarargPrimitive() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullability.java")
                     public void testInheritNullability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritNullability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritProjectionKind.java")
                     public void testInheritProjectionKind() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnliness.java")
                     public void testInheritReadOnliness() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritVararg.java")
                     public void testInheritVararg() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVararg.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritVarargInteger.java")
                     public void testInheritVarargInteger() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargInteger.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritVarargNotNull.java")
                     public void testInheritVarargNotNull() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritVarargPrimitive.java")
                     public void testInheritVarargPrimitive() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("Kt3302.java")
                     public void testKt3302() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/Kt3302.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("MutableToReadOnly.java")
                     public void testMutableToReadOnly() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("NotNullToNullable.java")
                     public void testNotNullToNullable() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("NullableToNotNull.java")
                     public void testNullableToNotNull() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("NullableToNotNullKotlinSignature.java")
                     public void testNullableToNotNullKotlinSignature() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("OverrideWithErasedParameter.java")
                     public void testOverrideWithErasedParameter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("ReadOnlyToMutable.java")
                     public void testReadOnlyToMutable() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubclassFromGenericAndNot.java")
                     public void testSubclassFromGenericAndNot() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameter.java")
                     public void testSubstitutedClassParameter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameters.java")
                     public void testSubstitutedClassParameters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Return extends AbstractLoadJavaTest {
                     @TestMetadata("AddNotNullJavaSubtype.java")
                     public void testAddNotNullJavaSubtype() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("AddNotNullSameJavaType.java")
                     public void testAddNotNullSameJavaType() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("AddNullabilityJavaSubtype.java")
                     public void testAddNullabilityJavaSubtype() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameGenericType1.java")
                     public void testAddNullabilitySameGenericType1() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameGenericType2.java")
                     public void testAddNullabilitySameGenericType2() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameJavaType.java")
                     public void testAddNullabilitySameJavaType() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     public void testAllFilesPresentInReturn() throws Exception {
@@ -828,147 +984,176 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("CantMakeImmutableInSubclass.java")
                     public void testCantMakeImmutableInSubclass() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter.java")
                     public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter2.java")
                     public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("HalfSubstitutedTypeParameters.java")
                     public void testHalfSubstitutedTypeParameters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilityGenericSubclassSimple.java")
                     public void testInheritNullabilityGenericSubclassSimple() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilityJavaSubtype.java")
                     public void testInheritNullabilityJavaSubtype() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilitySameGenericType.java")
                     public void testInheritNullabilitySameGenericType() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilitySameJavaType.java")
                     public void testInheritNullabilitySameJavaType() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritProjectionKind.java")
                     public void testInheritProjectionKind() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritProjectionKind.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessOfArgument.java")
                     public void testInheritReadOnlinessOfArgument() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessSameClass.java")
                     public void testInheritReadOnlinessSameClass() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessSubclass.java")
                     public void testInheritReadOnlinessSubclass() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SameProjectionKind.java")
                     public void testSameProjectionKind() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SameProjectionKind.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubclassFromGenericAndNot.java")
                     public void testSubclassFromGenericAndNot() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubclassOfCollection.java")
                     public void testSubclassOfCollection() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfCollection.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubclassOfMapEntry.java")
                     public void testSubclassOfMapEntry() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubclassOfMapEntry.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameter.java")
                     public void testSubstitutedClassParameter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameters.java")
                     public void testSubstitutedClassParameters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/SubstitutedClassParameters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesConflictingProjectionKinds.java")
                     public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.java")
                     public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.java")
                     public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesMutableAndNot.java")
                     public void testTwoSuperclassesMutableAndNot() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesReturnJavaSubtype.java")
                     public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesReturnSameJavaType.java")
                     public void testTwoSuperclassesReturnSameJavaType() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesSupplementNotNull.java")
                     public void testTwoSuperclassesSupplementNotNull() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfClass.java")
                     public void testTypeParamOfClass() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClass.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfClassSubstituted.java")
                     public void testTypeParamOfClassSubstituted() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfFun.java")
                     public void testTypeParamOfFun() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TypeParamOfFun.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class TypeParameter extends AbstractLoadJavaTest {
                     public void testAllFilesPresentInTypeParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true);
@@ -976,47 +1161,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("InheritMutability.java")
                     public void testInheritMutability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritNullability.java")
                     public void testInheritNullability() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritNullability.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnliness.java")
                     public void testInheritReadOnliness() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoBounds.java")
                     public void testTwoBounds() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoBounds.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclasses.java")
                     public void testTwoSuperclasses() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("TwoTypeParameters.java")
                     public void testTwoTypeParameters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("UseParameterAsUpperBound.java")
                     public void testUseParameterAsUpperBound() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("UseParameterInUpperBound.java")
                     public void testUseParameterInUpperBound() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.java")
                     public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                 }
@@ -1041,6 +1235,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/library")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Library extends AbstractLoadJavaTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1048,22 +1243,26 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("LoadIterable.java")
             public void testLoadIterable() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/library/LoadIterable.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterable.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("LoadIterator.java")
             public void testLoadIterator() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/library/LoadIterator.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/LoadIterator.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("Max.java")
             public void testMax() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/library/Max.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/library/Max.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/modality")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Modality extends AbstractLoadJavaTest {
             public void testAllFilesPresentInModality() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1071,12 +1270,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ModalityOfFakeOverrides.java")
             public void testModalityOfFakeOverrides() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/mutability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Mutability extends AbstractLoadJavaTest {
             public void testAllFilesPresentInMutability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1084,27 +1285,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("LoadIterable.java")
             public void testLoadIterable() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterable.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("LoadIterableWithConflict.java")
             public void testLoadIterableWithConflict() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithConflict.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("LoadIterableWithNullability.java")
             public void testLoadIterableWithNullability() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithNullability.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("LoadIterableWithPropagation.java")
             public void testLoadIterableWithPropagation() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/mutability/LoadIterableWithPropagation.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/notNull")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NotNull extends AbstractLoadJavaTest {
             public void testAllFilesPresentInNotNull() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1112,32 +1318,38 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("NotNullField.java")
             public void testNotNullField() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullField.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("NotNullIntArray.java")
             public void testNotNullIntArray() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("NotNullMethod.java")
             public void testNotNullMethod() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("NotNullObjectArray.java")
             public void testNotNullObjectArray() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("NotNullParameter.java")
             public void testNotNullParameter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/protectedPackage")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedPackage extends AbstractLoadJavaTest {
             public void testAllFilesPresentInProtectedPackage() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1145,22 +1357,26 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ProtectedPackageConstructor.java")
             public void testProtectedPackageConstructor() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ProtectedPackageFun.java")
             public void testProtectedPackageFun() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ProtectedPackageProperty.java")
             public void testProtectedPackageProperty() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/protectedStatic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ProtectedStatic extends AbstractLoadJavaTest {
             public void testAllFilesPresentInProtectedStatic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1168,12 +1384,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ConstructorInProtectedStaticNestedClass.java")
             public void testConstructorInProtectedStaticNestedClass() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/sam")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Sam.Adapters.class})
         public static class Sam extends AbstractLoadJavaTest {
             public void testAllFilesPresentInSam() throws Exception {
@@ -1182,70 +1400,84 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("Comparator.java")
             public void testComparator() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Comparator.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Comparator.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("FilenameFilter.java")
             public void testFilenameFilter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("GenericInterfaceParameterWithSelfBound.java")
             public void testGenericInterfaceParameterWithSelfBound() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("GenericInterfaceParametersWithBounds.java")
             public void testGenericInterfaceParametersWithBounds() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("GenericMethodParameters.java")
             public void testGenericMethodParameters() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("InterfaceWithObjectMethod.java")
             public void testInterfaceWithObjectMethod() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("Nested.java")
             public void testNested() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Nested.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Nested.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("Runnable.java")
             public void testRunnable() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Runnable.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/Runnable.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SamSubinterfaceOfTwo.java")
             public void testSamSubinterfaceOfTwo() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SamSubinterfaceOverridding.java")
             public void testSamSubinterfaceOverridding() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SubstitutedSamInterface.java")
             public void testSubstitutedSamInterface() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SubstitutedSamInterfaceSubclassOfBuiltin.java")
             public void testSubstitutedSamInterfaceSubclassOfBuiltin() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("VarargParameter.java")
             public void testVarargParameter() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/VarargParameter.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/VarargParameter.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Adapters.Inheritance.class})
             public static class Adapters extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInAdapters() throws Exception {
@@ -1254,59 +1486,71 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("AmbiguousAdapters.java")
                 public void testAmbiguousAdapters() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("Basic.java")
                 public void testBasic() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("Constructor.java")
                 public void testConstructor() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("DeepSamLoop.java")
                 public void testDeepSamLoop() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("NonTrivialFunctionType.java")
                 public void testNonTrivialFunctionType() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("SelfAsParameter.java")
                 public void testSelfAsParameter() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("SeveralSamParameters.java")
                 public void testSeveralSamParameters() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("TypeParameterOfClass.java")
                 public void testTypeParameterOfClass() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("TypeParameterOfMethod.java")
                 public void testTypeParameterOfMethod() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("TypeParameterOfOuterClass.java")
                 public void testTypeParameterOfOuterClass() throws Exception {
-                    doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java");
+                    doTestCompiledJava(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Inheritance extends AbstractLoadJavaTest {
                     @TestMetadata("AdapterDoesntOverrideDeclaration.java")
                     public void testAdapterDoesntOverrideDeclaration() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/AdapterDoesntOverrideDeclaration.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     public void testAllFilesPresentInInheritance() throws Exception {
@@ -1315,47 +1559,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("InheritedAdapterAndDeclaration.java")
                     public void testInheritedAdapterAndDeclaration() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAdapterAndDeclaration.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedAmbiguousAdapters.java")
                     public void testInheritedAmbiguousAdapters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAmbiguousAdapters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedAndOverriddenAmbiguousAdapters.java")
                     public void testInheritedAndOverriddenAmbiguousAdapters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedAndOverriddenAmbiguousAdapters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedOverridden.java")
                     public void testInheritedOverridden() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverridden.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedOverriddenAdapter.java")
                     public void testInheritedOverriddenAdapter() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedOverriddenAdapter.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedSameAdapters.java")
                     public void testInheritedSameAdapters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdapters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedSameAdaptersWithSubstitution.java")
                     public void testInheritedSameAdaptersWithSubstitution() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSameAdaptersWithSubstitution.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("InheritedSimple.java")
                     public void testInheritedSimple() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/InheritedSimple.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                     @TestMetadata("OverriddenAmbiguousAdapters.java")
                     public void testOverriddenAmbiguousAdapters() throws Exception {
-                        doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance/OverriddenAmbiguousAdapters.java");
+                        doTestCompiledJava(fileName);
                     }
                     
                 }
@@ -1377,6 +1630,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SignaturePropagation extends AbstractLoadJavaTest {
             public void testAllFilesPresentInSignaturePropagation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1384,42 +1638,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ArraysInSubtypes.java")
             public void testArraysInSubtypes() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("MethodTypeParameterErased.java")
             public void testMethodTypeParameterErased() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/MethodTypeParameterErased.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("RawSuperType.java")
             public void testRawSuperType() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("ReturnInnerSubclassOfSupersInner.java")
             public void testReturnInnerSubclassOfSupersInner() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/ReturnInnerSubclassOfSupersInner.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("SubclassWithRawType.java")
             public void testSubclassWithRawType() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/SubclassWithRawType.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("TwoSuperclassesInconsistentGenericTypes.java")
             public void testTwoSuperclassesInconsistentGenericTypes() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("TwoSuperclassesVarargAndNot.java")
             public void testTwoSuperclassesVarargAndNot() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/static")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Static extends AbstractLoadJavaTest {
             public void testAllFilesPresentInStatic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1427,42 +1689,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("DeeplyInnerClass.java")
             public void testDeeplyInnerClass() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("DeeplyNestedStatic.java")
             public void testDeeplyNestedStatic() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("Enum.java")
             public void testEnum() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/Enum.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Enum.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("InnerClass.java")
             public void testInnerClass() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/InnerClass.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/InnerClass.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("Simple.java")
             public void testSimple() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/Simple.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/Simple.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StaticFinal.java")
             public void testStaticFinal() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/StaticFinal.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticFinal.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("StaticMembersInEnum.java")
             public void testStaticMembersInEnum() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/static/StaticMembersInEnum.java");
+                doTestCompiledJava(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledJava/vararg")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Vararg extends AbstractLoadJavaTest {
             public void testAllFilesPresentInVararg() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1470,12 +1740,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("VarargInt.java")
             public void testVarargInt() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargInt.java");
+                doTestCompiledJava(fileName);
             }
             
             @TestMetadata("VarargString.java")
             public void testVarargString() throws Exception {
-                doTestCompiledJava("compiler/testData/loadJava/compiledJava/vararg/VarargString.java");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJava/vararg/VarargString.java");
+                doTestCompiledJava(fileName);
             }
             
         }
@@ -1502,6 +1774,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception {
@@ -1510,7 +1783,8 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         
         @TestMetadata("MixedPackage.txt")
         public void testMixedPackage() throws Exception {
-            doTestCompiledJavaAndKotlin("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt");
+            doTestCompiledJavaAndKotlin(fileName);
         }
         
         public static Test innerSuite() {
@@ -1521,6 +1795,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CompiledJavaIncludeObjectMethods extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledJavaIncludeObjectMethods() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1528,17 +1803,20 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         
         @TestMetadata("ClassWithObjectMethod.java")
         public void testClassWithObjectMethod() throws Exception {
-            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/ClassWithObjectMethod.java");
+            doTestCompiledJavaIncludeObjectMethods(fileName);
         }
         
         @TestMetadata("InterfaceWithObjectMethods.java")
         public void testInterfaceWithObjectMethods() throws Exception {
-            doTestCompiledJavaIncludeObjectMethods("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods/InterfaceWithObjectMethods.java");
+            doTestCompiledJavaIncludeObjectMethods(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
     public static class CompiledKotlin extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -1546,6 +1824,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class})
         public static class Annotations extends AbstractLoadJavaTest {
             public void testAllFilesPresentInAnnotations() throws Exception {
@@ -1554,20 +1833,24 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("AnnotatedAnnotation.kt")
             public void testAnnotatedAnnotation() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("AnnotatedMethod.kt")
             public void testAnnotatedMethod() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("SimpleAnnotation.kt")
             public void testSimpleAnnotation() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ClassMembers extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInClassMembers() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1575,42 +1858,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ClassObjectPropertyField.kt")
                 public void testClassObjectPropertyField() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Getter.kt")
                 public void testGetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertyField.kt")
                 public void testPropertyField() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Setter.kt")
                 public void testSetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Classes extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInClasses() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1618,77 +1909,92 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("AnnotationInClassObject.kt")
                 public void testAnnotationInClassObject() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassInClassObject.kt")
                 public void testClassInClassObject() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassObject.kt")
                 public void testClassObject() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassObjectInStaticNestedClass.kt")
                 public void testClassObjectInStaticNestedClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Deprecated.kt")
                 public void testDeprecated() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("DollarsInAnnotationName.kt")
                 public void testDollarsInAnnotationName() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MultipleAnnotations.kt")
                 public void testMultipleAnnotations() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NestedAnnotation.kt")
                 public void testNestedAnnotation() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NestedClass.kt")
                 public void testNestedClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Retention.kt")
                 public void testRetention() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Simple.kt")
                 public void testSimple() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("WithArgument.kt")
                 public void testWithArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("WithMultipleArguments.kt")
                 public void testWithMultipleArguments() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PackageMembers extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInPackageMembers() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1696,47 +2002,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("EnumArrayArgument.kt")
                 public void testEnumArrayArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Getter.kt")
                 public void testGetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertyField.kt")
                 public void testPropertyField() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Setter.kt")
                 public void testSetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("StringArrayArgument.kt")
                 public void testStringArrayArgument() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Parameters extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInParameters() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1744,62 +2059,74 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("Constructor.kt")
                 public void testConstructor() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("EnumConstructor.kt")
                 public void testEnumConstructor() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtensionFunctionInClass.kt")
                 public void testExtensionFunctionInClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtensionPropertySetter.kt")
                 public void testExtensionPropertySetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunctionInClass.kt")
                 public void testFunctionInClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunctionInTrait.kt")
                 public void testFunctionInTrait() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ManyAnnotations.kt")
                 public void testManyAnnotations() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertySetterInClass.kt")
                 public void testPropertySetterInClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("TopLevelFunction.kt")
                 public void testTopLevelFunction() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("TopLevelPropertySetter.kt")
                 public void testTopLevelPropertySetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PropertiesWithoutBackingFields extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1807,42 +2134,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("Class.kt")
                 public void testClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassObject.kt")
                 public void testClassObject() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtensionsWithSameNameClass.kt")
                 public void testExtensionsWithSameNameClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtensionsWithSameNamePackage.kt")
                 public void testExtensionsWithSameNamePackage() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NestedTrait.kt")
                 public void testNestedTrait() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("TopLevel.kt")
                 public void testTopLevel() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Trait.kt")
                 public void testTrait() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("TraitClassObject.kt")
                 public void testTraitClassObject() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -1860,6 +2195,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Class.JavaBean.class})
         public static class Class extends AbstractLoadJavaTest {
             public void testAllFilesPresentInClass() throws Exception {
@@ -1868,170 +2204,204 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("Class.kt")
             public void testClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassInParam.kt")
             public void testClassInParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassInnerClass.kt")
             public void testClassInnerClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassMemberConflict.kt")
             public void testClassMemberConflict() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassOutParam.kt")
             public void testClassOutParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParam.kt")
             public void testClassParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamReferencesParam.kt")
             public void testClassParamReferencesParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamReferencesParam2.kt")
             public void testClassParamReferencesParam2() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamReferencesSelf.kt")
             public void testClassParamReferencesSelf() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamUpperClassBound.kt")
             public void testClassParamUpperClassBound() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamUpperClassInterfaceBound.kt")
             public void testClassParamUpperClassInterfaceBound() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamUpperInterfaceBound.kt")
             public void testClassParamUpperInterfaceBound() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassTwoParams.kt")
             public void testClassTwoParams() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassTwoParams2.kt")
             public void testClassTwoParams2() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("EnumWithGenericConstructorParameter.kt")
             public void testEnumWithGenericConstructorParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
             public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritClassSimple.kt")
             public void testInheritClassSimple() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritClassWithParam.kt")
             public void testInheritClassWithParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritSubstitutedMethod.kt")
             public void testInheritSubstitutedMethod() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritTraitWithFunctionParam.kt")
             public void testInheritTraitWithFunctionParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritTraitWithParam.kt")
             public void testInheritTraitWithParam() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InnerClassExtendInnerClass.kt")
             public void testInnerClassExtendInnerClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InnerGenericClass.kt")
             public void testInnerGenericClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NamedObject.kt")
             public void testNamedObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NamedObjectInClass.kt")
             public void testNamedObjectInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NamedObjectInClassObject.kt")
             public void testNamedObjectInClassObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NamedObjectInNamedObject.kt")
             public void testNamedObjectInNamedObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt")
             public void testNamedObjectWithAnotherTopLevelProperty() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NestedClassExtendNestedClass.kt")
             public void testNestedClassExtendNestedClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NestedGenericClass.kt")
             public void testNestedGenericClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("SingleAbstractMethod.kt")
             public void testSingleAbstractMethod() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean")
+            @TestDataPath("$PROJECT_ROOT")
             public static class JavaBean extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInJavaBean() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2039,32 +2409,38 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("DifferentGetterAndSetter.kt")
                 public void testDifferentGetterAndSetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("JavaBeanAbstractGetter.kt")
                 public void testJavaBeanAbstractGetter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVal.kt")
                 public void testJavaBeanVal() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVar.kt")
                 public void testJavaBeanVar() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVarOfGenericType.kt")
                 public void testJavaBeanVarOfGenericType() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("TwoSetters.kt")
                 public void testTwoSetters() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -2078,6 +2454,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassFun extends AbstractLoadJavaTest {
             public void testAllFilesPresentInClassFun() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2085,37 +2462,44 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ClassInParamUsedInFun.kt")
             public void testClassInParamUsedInFun() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassParamUsedInFun.kt")
             public void testClassParamUsedInFun() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("FunDelegationToTraitImpl.kt")
             public void testFunDelegationToTraitImpl() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("FunInParamSuper.kt")
             public void testFunInParamSuper() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TraitFinalFun.kt")
             public void testTraitFinalFun() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TraitOpenFun.kt")
             public void testTraitOpenFun() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassObject extends AbstractLoadJavaTest {
             public void testAllFilesPresentInClassObject() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2123,67 +2507,80 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ClassObjectDeclaresVal.kt")
             public void testClassObjectDeclaresVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectDeclaresVar.kt")
             public void testClassObjectDeclaresVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectDefaultVisibility.kt")
             public void testClassObjectDefaultVisibility() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectExplicitVisibility.kt")
             public void testClassObjectExplicitVisibility() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectExtendsTrait.kt")
             public void testClassObjectExtendsTrait() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectExtendsTraitWithTP.kt")
             public void testClassObjectExtendsTraitWithTP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("classObjectInClassStaticFields.kt")
             public void testClassObjectInClassStaticFields() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("classObjectInTraitStaticFields.kt")
             public void testClassObjectInTraitStaticFields() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObjectPropertyInClass.kt")
             public void testClassObjectPropertyInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InnerClassInClassObject.kt")
             public void testInnerClassInClassObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("SimpleClassObject.kt")
             public void testSimpleClassObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Constructor.Vararg.class})
         public static class Constructor extends AbstractLoadJavaTest {
             public void testAllFilesPresentInConstructor() throws Exception {
@@ -2192,85 +2589,102 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("Constructor0.kt")
             public void testConstructor0() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Constructor1.kt")
             public void testConstructor1() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Constructor1WithParamDefaultValue.kt")
             public void testConstructor1WithParamDefaultValue() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Constructor2WithOneParamDefaultValue.kt")
             public void testConstructor2WithOneParamDefaultValue() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorCollectionParameter.kt")
             public void testConstructorCollectionParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorGenericDeep.kt")
             public void testConstructorGenericDeep() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorGenericSimple.kt")
             public void testConstructorGenericSimple() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorGenericUpperBound.kt")
             public void testConstructorGenericUpperBound() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoDefArgs.kt")
             public void testConstructorWithTwoDefArgs() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParameters.kt")
             public void testConstructorWithTwoTypeParameters() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTypeParameter.kt")
             public void testConstructorWithTypeParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt")
             public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InnerClassConstructorWithDefArgs.kt")
             public void testInnerClassConstructorWithDefArgs() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt")
             public void testPrivateConstructor1WithParamDefaultValue() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Vararg extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInVararg() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2278,12 +2692,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ConstructorNonLastVararg.kt")
                 public void testConstructorNonLastVararg() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ConstructorVararg.kt")
                 public void testConstructorVararg() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -2297,6 +2713,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DataClass extends AbstractLoadJavaTest {
             public void testAllFilesPresentInDataClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2304,42 +2721,50 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("MixedComponents.kt")
             public void testMixedComponents() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NoComponents.kt")
             public void testNoComponents() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("OneVal.kt")
             public void testOneVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("OpenDataClass.kt")
             public void testOpenDataClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("OpenPropertyFinalComponent.kt")
             public void testOpenPropertyFinalComponent() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TwoVals.kt")
             public void testTwoVals() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TwoVars.kt")
             public void testTwoVars() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Enum extends AbstractLoadJavaTest {
             public void testAllFilesPresentInEnum() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2347,32 +2772,38 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("enumVisibility.kt")
             public void testEnumVisibility() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("enumWithConstuctor.kt")
             public void testEnumWithConstuctor() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("innerEnum.kt")
             public void testInnerEnum() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("innerEnumExistingClassObject.kt")
             public void testInnerEnumExistingClassObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("simpleEnum.kt")
             public void testSimpleEnum() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class})
         public static class FromLoadJava extends AbstractLoadJavaTest {
             public void testAllFilesPresentInFromLoadJava() throws Exception {
@@ -2381,180 +2812,216 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ArrayTypeVariance.kt")
             public void testArrayTypeVariance() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassDoesNotOverrideMethod.kt")
             public void testClassDoesNotOverrideMethod() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassObject.kt")
             public void testClassObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("classObjectAnnotation.kt")
             public void testClassObjectAnnotation() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithConstVal.kt")
             public void testClassWithConstVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypeP.kt")
             public void testClassWithTypeP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypePExtendsIterableP.kt")
             public void testClassWithTypePExtendsIterableP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypePP.kt")
             public void testClassWithTypePP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefNext.kt")
             public void testClassWithTypePRefNext() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefSelf.kt")
             public void testClassWithTypePRefSelf() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefSelfAndClass.kt")
             public void testClassWithTypePRefSelfAndClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("FieldOfArrayType.kt")
             public void testFieldOfArrayType() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("FinalFieldAsVal.kt")
             public void testFinalFieldAsVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("genericFunction.kt")
             public void testGenericFunction() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypes.kt")
             public void testInheritMethodsDifferentReturnTypes() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt")
             public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InnerClass.kt")
             public void testInnerClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethodTypePOneUpperBound.kt")
             public void testMethodTypePOneUpperBound() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethodTypePTwoUpperBounds.kt")
             public void testMethodTypePTwoUpperBounds() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethodWithTypeP.kt")
             public void testMethodWithTypeP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethodWithTypePP.kt")
             public void testMethodWithTypePP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethodWithTypePRefClassP.kt")
             public void testMethodWithTypePRefClassP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MethosWithPRefTP.kt")
             public void testMethosWithPRefTP() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("MyException.kt")
             public void testMyException() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("objectInClass.kt")
             public void testObjectInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("objectMembers.kt")
             public void testObjectMembers() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("packageLevelObject.kt")
             public void testPackageLevelObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("RemoveRedundantProjectionKind.kt")
             public void testRemoveRedundantProjectionKind() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Simple.kt")
             public void testSimple() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TwoFields.kt")
             public void testTwoFields() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("UnboundWildcard.kt")
             public void testUnboundWildcard() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
             public static class KotlinSignature extends AbstractLoadJavaTest {
                 @TestMetadata("AllBoundsInWhen.kt")
                 public void testAllBoundsInWhen() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 public void testAllFilesPresentInKotlinSignature() throws Exception {
@@ -2563,84 +3030,101 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ArrayType.kt")
                 public void testArrayType() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithNewTypeParams.kt")
                 public void testConstructorWithNewTypeParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithParentTypeParams.kt")
                 public void testConstructorWithParentTypeParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithSeveralParams.kt")
                 public void testConstructorWithSeveralParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithoutParams.kt")
                 public void testConstructorWithoutParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("CustomProjectionKind.kt")
                 public void testCustomProjectionKind() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MethodWithFunctionTypes.kt")
                 public void testMethodWithFunctionTypes() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MethodWithGenerics.kt")
                 public void testMethodWithGenerics() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MethodWithMappedClasses.kt")
                 public void testMethodWithMappedClasses() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MethodWithTypeParameters.kt")
                 public void testMethodWithTypeParameters() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("MethodWithVararg.kt")
                 public void testMethodWithVararg() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertyArrayTypes.kt")
                 public void testPropertyArrayTypes() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertyComplexTypes.kt")
                 public void testPropertyComplexTypes() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("PropertySimpleType.kt")
                 public void testPropertySimpleType() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("StarProjection.kt")
                 public void testStarProjection() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Error extends AbstractLoadJavaTest {
                     @TestMetadata("AddingNullability.kt")
                     public void testAddingNullability() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     public void testAllFilesPresentInError() throws Exception {
@@ -2649,137 +3133,164 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("ConflictingProjectionKind.kt")
                     public void testConflictingProjectionKind() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("ExplicitFieldGettersAndSetters.kt")
                     public void testExplicitFieldGettersAndSetters() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("ExtraUpperBound.kt")
                     public void testExtraUpperBound() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("MissingUpperBound.kt")
                     public void testMissingUpperBound() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("NoFieldTypeRef.kt")
                     public void testNoFieldTypeRef() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("NotVarargReplacedWithVararg.kt")
                     public void testNotVarargReplacedWithVararg() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("RedundantProjectionKind.kt")
                     public void testRedundantProjectionKind() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("ReturnTypeMissing.kt")
                     public void testReturnTypeMissing() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("SyntaxError.kt")
                     public void testSyntaxError() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("SyntaxErrorInFieldAnnotation.kt")
                     public void testSyntaxErrorInFieldAnnotation() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("VarargReplacedWithNotVararg.kt")
                     public void testVarargReplacedWithNotVararg() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongFieldInitializer.kt")
                     public void testWrongFieldInitializer() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongFieldMutability.kt")
                     public void testWrongFieldMutability() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongFieldName.kt")
                     public void testWrongFieldName() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongMethodName.kt")
                     public void testWrongMethodName() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongProjectionKind.kt")
                     public void testWrongProjectionKind() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongReturnTypeStructure.kt")
                     public void testWrongReturnTypeStructure() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName1.kt")
                     public void testWrongTypeName1() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName2.kt")
                     public void testWrongTypeName2() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName3.kt")
                     public void testWrongTypeName3() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParameterBoundStructure1.kt")
                     public void testWrongTypeParameterBoundStructure1() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParameterBoundStructure2.kt")
                     public void testWrongTypeParameterBoundStructure2() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParametersCount.kt")
                     public void testWrongTypeParametersCount() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongValueParameterStructure1.kt")
                     public void testWrongValueParameterStructure1() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongValueParameterStructure2.kt")
                     public void testWrongValueParameterStructure2() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("WrongValueParametersCount.kt")
                     public void testWrongValueParametersCount() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
+                @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
                 public static class Propagation extends AbstractLoadJavaTest {
                     public void testAllFilesPresentInPropagation() throws Exception {
@@ -2788,10 +3299,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                     
                     @TestMetadata("PropagateTypeArgumentNullable.kt")
                     public void testPropagateTypeArgumentNullable() throws Exception {
-                        doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                        doTestCompiledKotlin(fileName);
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class Parameter extends AbstractLoadJavaTest {
                         public void testAllFilesPresentInParameter() throws Exception {
                             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2799,166 +3312,199 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                         
                         @TestMetadata("ChangeProjectionKind1.kt")
                         public void testChangeProjectionKind1() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("ChangeProjectionKind2.kt")
                         public void testChangeProjectionKind2() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter.kt")
                         public void testDeeplySubstitutedClassParameter() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                         public void testDeeplySubstitutedClassParameter2() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritMutability.kt")
                         public void testInheritMutability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNotVararg.kt")
                         public void testInheritNotVararg() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargInteger.kt")
                         public void testInheritNotVarargInteger() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargNotNull.kt")
                         public void testInheritNotVarargNotNull() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargPrimitive.kt")
                         public void testInheritNotVarargPrimitive() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullability.kt")
                         public void testInheritNullability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritProjectionKind.kt")
                         public void testInheritProjectionKind() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnliness.kt")
                         public void testInheritReadOnliness() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritVararg.kt")
                         public void testInheritVararg() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritVarargInteger.kt")
                         public void testInheritVarargInteger() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritVarargNotNull.kt")
                         public void testInheritVarargNotNull() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritVarargPrimitive.kt")
                         public void testInheritVarargPrimitive() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("Kt3302.kt")
                         public void testKt3302() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("MutableToReadOnly.kt")
                         public void testMutableToReadOnly() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("NotNullToNullable.kt")
                         public void testNotNullToNullable() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("NullableToNotNull.kt")
                         public void testNullableToNotNull() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("NullableToNotNullKotlinSignature.kt")
                         public void testNullableToNotNullKotlinSignature() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("OverrideWithErasedParameter.kt")
                         public void testOverrideWithErasedParameter() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("ReadOnlyToMutable.kt")
                         public void testReadOnlyToMutable() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubclassFromGenericAndNot.kt")
                         public void testSubclassFromGenericAndNot() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameter.kt")
                         public void testSubstitutedClassParameter() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameters.kt")
                         public void testSubstitutedClassParameters() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class Return extends AbstractLoadJavaTest {
                         @TestMetadata("AddNotNullJavaSubtype.kt")
                         public void testAddNotNullJavaSubtype() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("AddNotNullSameJavaType.kt")
                         public void testAddNotNullSameJavaType() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("AddNullabilityJavaSubtype.kt")
                         public void testAddNullabilityJavaSubtype() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameGenericType1.kt")
                         public void testAddNullabilitySameGenericType1() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameGenericType2.kt")
                         public void testAddNullabilitySameGenericType2() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameJavaType.kt")
                         public void testAddNullabilitySameJavaType() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         public void testAllFilesPresentInReturn() throws Exception {
@@ -2967,147 +3513,176 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                         
                         @TestMetadata("CantMakeImmutableInSubclass.kt")
                         public void testCantMakeImmutableInSubclass() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter.kt")
                         public void testDeeplySubstitutedClassParameter() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                         public void testDeeplySubstitutedClassParameter2() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("HalfSubstitutedTypeParameters.kt")
                         public void testHalfSubstitutedTypeParameters() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilityGenericSubclassSimple.kt")
                         public void testInheritNullabilityGenericSubclassSimple() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilityJavaSubtype.kt")
                         public void testInheritNullabilityJavaSubtype() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilitySameGenericType.kt")
                         public void testInheritNullabilitySameGenericType() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilitySameJavaType.kt")
                         public void testInheritNullabilitySameJavaType() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritProjectionKind.kt")
                         public void testInheritProjectionKind() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessOfArgument.kt")
                         public void testInheritReadOnlinessOfArgument() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessSameClass.kt")
                         public void testInheritReadOnlinessSameClass() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessSubclass.kt")
                         public void testInheritReadOnlinessSubclass() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SameProjectionKind.kt")
                         public void testSameProjectionKind() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubclassFromGenericAndNot.kt")
                         public void testSubclassFromGenericAndNot() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubclassOfCollection.kt")
                         public void testSubclassOfCollection() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubclassOfMapEntry.kt")
                         public void testSubclassOfMapEntry() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameter.kt")
                         public void testSubstitutedClassParameter() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameters.kt")
                         public void testSubstitutedClassParameters() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt")
                         public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt")
                         public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt")
                         public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesMutableAndNot.kt")
                         public void testTwoSuperclassesMutableAndNot() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt")
                         public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesReturnSameJavaType.kt")
                         public void testTwoSuperclassesReturnSameJavaType() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesSupplementNotNull.kt")
                         public void testTwoSuperclassesSupplementNotNull() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfClass.kt")
                         public void testTypeParamOfClass() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfClassSubstituted.kt")
                         public void testTypeParamOfClassSubstituted() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfFun.kt")
                         public void testTypeParamOfFun() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class TypeParameter extends AbstractLoadJavaTest {
                         public void testAllFilesPresentInTypeParameter() throws Exception {
                             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3115,47 +3690,56 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                         
                         @TestMetadata("InheritMutability.kt")
                         public void testInheritMutability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritNullability.kt")
                         public void testInheritNullability() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnliness.kt")
                         public void testInheritReadOnliness() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoBounds.kt")
                         public void testTwoBounds() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclasses.kt")
                         public void testTwoSuperclasses() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("TwoTypeParameters.kt")
                         public void testTwoTypeParameters() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("UseParameterAsUpperBound.kt")
                         public void testUseParameterAsUpperBound() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("UseParameterInUpperBound.kt")
                         public void testUseParameterInUpperBound() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                         @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt")
                         public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
-                            doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                            doTestCompiledKotlin(fileName);
                         }
                         
                     }
@@ -3180,6 +3764,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Library extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInLibrary() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3187,22 +3772,26 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("LoadIterable.kt")
                 public void testLoadIterable() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("LoadIterator.kt")
                 public void testLoadIterator() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("Max.kt")
                 public void testMax() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Modality extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInModality() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3210,12 +3799,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ModalityOfFakeOverrides.kt")
                 public void testModalityOfFakeOverrides() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NotNull extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInNotNull() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3223,27 +3814,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("NotNullField.kt")
                 public void testNotNullField() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NotNullIntArray.kt")
                 public void testNotNullIntArray() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NotNullMethod.kt")
                 public void testNotNullMethod() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NotNullObjectArray.kt")
                 public void testNotNullObjectArray() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NotNullParameter.kt")
                 public void testNotNullParameter() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -3260,6 +3856,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class})
         public static class Fun extends AbstractLoadJavaTest {
             public void testAllFilesPresentInFun() throws Exception {
@@ -3268,55 +3865,66 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("Assert.kt")
             public void testAssert() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("DeclaredMemberOverridesDelegated.kt")
             public void testDeclaredMemberOverridesDelegated() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt")
             public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritValAndVar.kt")
             public void testInheritValAndVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InheritValsDifferentTypes.kt")
             public void testInheritValsDifferentTypes() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NoDelegationForFunctionInheritedFromTraitSuperClass.kt")
             public void testNoDelegationForFunctionInheritedFromTraitSuperClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NoSamAdapter.kt")
             public void testNoSamAdapter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NoSamConstructor.kt")
             public void testNoSamConstructor() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PropagateDeepSubclass.kt")
             public void testPropagateDeepSubclass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PropagateSubclassOfComparable.kt")
             public void testPropagateSubclassOfComparable() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables")
+            @TestDataPath("$PROJECT_ROOT")
             public static class GenericWithTypeVariables extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3324,57 +3932,68 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("FunGenericParam.kt")
                 public void testFunGenericParam() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamParam.kt")
                 public void testFunParamParam() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamParamErased.kt")
                 public void testFunParamParamErased() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamReferencesParam.kt")
                 public void testFunParamReferencesParam() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamTwoUpperBounds.kt")
                 public void testFunParamTwoUpperBounds() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperClassBound.kt")
                 public void testFunParamUpperClassBound() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperClassInterfaceBound.kt")
                 public void testFunParamUpperClassInterfaceBound() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperInterfaceBound.kt")
                 public void testFunParamUpperInterfaceBound() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamVaragParam.kt")
                 public void testFunParamVaragParam() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunTwoTypeParams.kt")
                 public void testFunTwoTypeParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables")
+            @TestDataPath("$PROJECT_ROOT")
             public static class GenericWithoutTypeVariables extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3382,32 +4001,38 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("FunClassParamNotNull.kt")
                 public void testFunClassParamNotNull() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunClassParamNullable.kt")
                 public void testFunClassParamNullable() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamNullable.kt")
                 public void testFunParamNullable() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNotNull.kt")
                 public void testReturnTypeClassParamNotNull() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNullable.kt")
                 public void testReturnTypeClassParamNullable() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NonGeneric extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInNonGeneric() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3415,87 +4040,104 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ClassFun.kt")
                 public void testClassFun() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassFunGetFoo.kt")
                 public void testClassFunGetFoo() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassFunGetFooSetFoo.kt")
                 public void testClassFunGetFooSetFoo() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassFunSetFoo.kt")
                 public void testClassFunSetFoo() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtFun.kt")
                 public void testExtFun() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtFunInClass.kt")
                 public void testExtFunInClass() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunDefaultArg.kt")
                 public void testFunDefaultArg() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunParamNotNull.kt")
                 public void testFunParamNotNull() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunVarargInt.kt")
                 public void testFunVarargInt() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("FunVarargInteger.kt")
                 public void testFunVarargInteger() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ModifierAbstract.kt")
                 public void testModifierAbstract() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ModifierOpen.kt")
                 public void testModifierOpen() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NsFun.kt")
                 public void testNsFun() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("NsFunGetFoo.kt")
                 public void testNsFunGetFoo() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeNotNull.kt")
                 public void testReturnTypeNotNull() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeNullable.kt")
                 public void testReturnTypeNullable() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Vararg extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInVararg() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3503,17 +4145,20 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("nonLastVararg.kt")
                 public void testNonLastVararg() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("VarargInt.kt")
                 public void testVarargInt() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("VarargString.kt")
                 public void testVarargString() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -3530,6 +4175,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Inline extends AbstractLoadJavaTest {
             public void testAllFilesPresentInInline() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3537,12 +4183,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("inlineFunction.kt")
             public void testInlineFunction() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Prop.DefaultAccessors.class})
         public static class Prop extends AbstractLoadJavaTest {
             public void testAllFilesPresentInProp() throws Exception {
@@ -3551,165 +4199,198 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("ClassVal.kt")
             public void testClassVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassValAbstract.kt")
             public void testClassValAbstract() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ClassVar.kt")
             public void testClassVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("CollectionSize.kt")
             public void testCollectionSize() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Constants.kt")
             public void testConstants() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValClass.kt")
             public void testExtValClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValInClass.kt")
             public void testExtValInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValInt.kt")
             public void testExtValInt() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValIntCharSequence.kt")
             public void testExtValIntCharSequence() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValIntCharSequenceQ.kt")
             public void testExtValIntCharSequenceQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValIntListQOfIntInClass.kt")
             public void testExtValIntListQOfIntInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValIntTInClass.kt")
             public void testExtValIntTInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValIntTQInClass.kt")
             public void testExtValIntTQInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtValTIntInClass.kt")
             public void testExtValTIntInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarClass.kt")
             public void testExtVarClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarInClass.kt")
             public void testExtVarInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarInt.kt")
             public void testExtVarInt() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarIntTInClass.kt")
             public void testExtVarIntTInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarIntTQInClass.kt")
             public void testExtVarIntTQInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarMapPQInt.kt")
             public void testExtVarMapPQInt() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarTIntInClass.kt")
             public void testExtVarTIntInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarTQIntInClass.kt")
             public void testExtVarTQIntInClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ExtVarl.kt")
             public void testExtVarl() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NsVal.kt")
             public void testNsVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NsVar.kt")
             public void testNsVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("OverrideClassVal.kt")
             public void testOverrideClassVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("OverrideTraitVal.kt")
             public void testOverrideTraitVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PropFromSuperclass.kt")
             public void testPropFromSuperclass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TraitFinalVar.kt")
             public void testTraitFinalVar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TraitOpenVal.kt")
             public void testTraitOpenVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("VarDelegationToTraitImpl.kt")
             public void testVarDelegationToTraitImpl() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("VarWithDelegated.kt")
             public void testVarWithDelegated() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DefaultAccessors extends AbstractLoadJavaTest {
                 public void testAllFilesPresentInDefaultAccessors() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3717,52 +4398,62 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
                 
                 @TestMetadata("ClassVal.kt")
                 public void testClassVal() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassValParams.kt")
                 public void testClassValParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassValWithGet.kt")
                 public void testClassValWithGet() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassVar.kt")
                 public void testClassVar() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassVarModality.kt")
                 public void testClassVarModality() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassVarParams.kt")
                 public void testClassVarParams() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassVarWithGet.kt")
                 public void testClassVarWithGet() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ClassVarWithSet.kt")
                 public void testClassVarWithSet() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtValLong.kt")
                 public void testExtValLong() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
                 @TestMetadata("ExtVarLong.kt")
                 public void testExtVarLong() throws Exception {
-                    doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                    doTestCompiledKotlin(fileName);
                 }
                 
             }
@@ -3776,6 +4467,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/type")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Type extends AbstractLoadJavaTest {
             public void testAllFilesPresentInType() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3783,152 +4475,182 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("Any.kt")
             public void testAny() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("AnyQ.kt")
             public void testAnyQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfInNumber.kt")
             public void testArrayOfInNumber() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfInt.kt")
             public void testArrayOfInt() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfInteger.kt")
             public void testArrayOfInteger() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfOutNumber.kt")
             public void testArrayOfOutNumber() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfOutT.kt")
             public void testArrayOfOutT() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ArrayOfString.kt")
             public void testArrayOfString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Function1IntString.kt")
             public void testFunction1IntString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Int.kt")
             public void testInt() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("IntArray.kt")
             public void testIntArray() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("IntQ.kt")
             public void testIntQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlInteger.kt")
             public void testJlInteger() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlIntegerQ.kt")
             public void testJlIntegerQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlNumber.kt")
             public void testJlNumber() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlObject.kt")
             public void testJlObject() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlObjectQ.kt")
             public void testJlObjectQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlString.kt")
             public void testJlString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("jlStringQ.kt")
             public void testJlStringQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ListOfAny.kt")
             public void testListOfAny() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ListOfAnyQ.kt")
             public void testListOfAnyQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ListOfStar.kt")
             public void testListOfStar() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ListOfString.kt")
             public void testListOfString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("ListOfjlString.kt")
             public void testListOfjlString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Nothing.kt")
             public void testNothing() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("NothingQ.kt")
             public void testNothingQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("String.kt")
             public void testString() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("StringQ.kt")
             public void testStringQ() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("Unit.kt")
             public void testUnit() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractLoadJavaTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3936,67 +4658,80 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("InternalAbstractTraitMembersOverridden.kt")
             public void testInternalAbstractTraitMembersOverridden() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InternalClass.kt")
             public void testInternalClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InternalConstructor.kt")
             public void testInternalConstructor() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InternalTopLevelMembers.kt")
             public void testInternalTopLevelMembers() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InternalTraitMembers.kt")
             public void testInternalTraitMembers() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("InternalTraitMembersInherited.kt")
             public void testInternalTraitMembersInherited() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PrivateClass.kt")
             public void testPrivateClass() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PrivateClassMembers.kt")
             public void testPrivateClassMembers() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PrivateTopLevelFun.kt")
             public void testPrivateTopLevelFun() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PrivateTopLevelVal.kt")
             public void testPrivateTopLevelVal() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PropertyInConstructor.kt")
             public void testPropertyInConstructor() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("PropertyInConstructorExplicitVisibility.kt")
             public void testPropertyInConstructorExplicitVisibility() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+                doTestCompiledKotlin(fileName);
             }
             
             @TestMetadata("TopLevelVarWithPrivateSetter.kt")
             public void testTopLevelVarWithPrivateSetter() throws Exception {
-                doTestCompiledKotlin("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+                doTestCompiledKotlin(fileName);
             }
             
         }
@@ -4022,6 +4757,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CompiledKotlinWithStdlib.Mutability.class, CompiledKotlinWithStdlib.PlatformNames.class})
     public static class CompiledKotlinWithStdlib extends AbstractLoadJavaTest {
         public void testAllFilesPresentInCompiledKotlinWithStdlib() throws Exception {
@@ -4029,6 +4765,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Mutability extends AbstractLoadJavaTest {
             public void testAllFilesPresentInMutability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4036,27 +4773,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("LoadIterable.kt")
             public void testLoadIterable() throws Exception {
-                doTestCompiledKotlinWithStdlib("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterable.kt");
+                doTestCompiledKotlinWithStdlib(fileName);
             }
             
             @TestMetadata("LoadIterableWithConflict.kt")
             public void testLoadIterableWithConflict() throws Exception {
-                doTestCompiledKotlinWithStdlib("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithConflict.kt");
+                doTestCompiledKotlinWithStdlib(fileName);
             }
             
             @TestMetadata("LoadIterableWithNullability.kt")
             public void testLoadIterableWithNullability() throws Exception {
-                doTestCompiledKotlinWithStdlib("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithNullability.kt");
+                doTestCompiledKotlinWithStdlib(fileName);
             }
             
             @TestMetadata("LoadIterableWithPropagation.kt")
             public void testLoadIterableWithPropagation() throws Exception {
-                doTestCompiledKotlinWithStdlib("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability/LoadIterableWithPropagation.kt");
+                doTestCompiledKotlinWithStdlib(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PlatformNames extends AbstractLoadJavaTest {
             public void testAllFilesPresentInPlatformNames() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4064,7 +4806,8 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("functionName.kt")
             public void testFunctionName() throws Exception {
-                doTestCompiledKotlinWithStdlib("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames/functionName.kt");
+                doTestCompiledKotlinWithStdlib(fileName);
             }
             
         }
@@ -4079,6 +4822,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({JavaAgainstKotlin.SamAdapters.class, JavaAgainstKotlin.SignaturePropagation.class, JavaAgainstKotlin.Visibility.class})
     public static class JavaAgainstKotlin extends AbstractLoadJavaTest {
         public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
@@ -4086,6 +4830,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class SamAdapters extends AbstractLoadJavaTest {
             public void testAllFilesPresentInSamAdapters() throws Exception {
@@ -4094,27 +4839,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("InheritAmbguousSamAdaptersInKotlin.txt")
             public void testInheritAmbguousSamAdaptersInKotlin() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritAmbguousSamAdaptersInKotlin.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("InheritSamAdapterInKotlin.txt")
             public void testInheritSamAdapterInKotlin() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/InheritSamAdapterInKotlin.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("OverrideSamAdapterInKotlin.txt")
             public void testOverrideSamAdapterInKotlin() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/OverrideSamAdapterInKotlin.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("SamAdapterForInheritedFromKotlin.txt")
             public void testSamAdapterForInheritedFromKotlin() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForInheritedFromKotlin.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("SamAdapterForOverriddenFromKotlin.txt")
             public void testSamAdapterForOverriddenFromKotlin() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             public static Test innerSuite() {
@@ -4125,6 +4875,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class SignaturePropagation extends AbstractLoadJavaTest {
             public void testAllFilesPresentInSignaturePropagation() throws Exception {
@@ -4133,27 +4884,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("DeepSubclassingKotlinInJava.txt")
             public void testDeepSubclassingKotlinInJava() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/DeepSubclassingKotlinInJava.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("InheritExtensionAndNot.txt")
             public void testInheritExtensionAndNot() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("InheritExtensionFunction.txt")
             public void testInheritExtensionFunction() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionFunction.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("SubclassFromTraitImplementation.txt")
             public void testSubclassFromTraitImplementation() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassFromTraitImplementation.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("SubclassingKotlinInJava.txt")
             public void testSubclassingKotlinInJava() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             public static Test innerSuite() {
@@ -4164,6 +4920,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         }
         
         @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class Visibility extends AbstractLoadJavaTest {
             public void testAllFilesPresentInVisibility() throws Exception {
@@ -4172,12 +4929,14 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
             
             @TestMetadata("PackageLocal.txt")
             public void testPackageLocal() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/PackageLocal.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             @TestMetadata("ProtectedPackage.txt")
             public void testProtectedPackage() throws Exception {
-                doTestJavaAgainstKotlin("compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt");
+                doTestJavaAgainstKotlin(fileName);
             }
             
             public static Test innerSuite() {
@@ -4198,6 +4957,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
     }
     
     @TestMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinAgainstCompiledJavaWithKotlin extends AbstractLoadJavaTest {
         public void testAllFilesPresentInKotlinAgainstCompiledJavaWithKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -4205,27 +4965,32 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         
         @TestMetadata("InheritJavaField.kt")
         public void testInheritJavaField() throws Exception {
-            doTestKotlinAgainstCompiledJavaWithKotlin("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritJavaField.kt");
+            doTestKotlinAgainstCompiledJavaWithKotlin(fileName);
         }
         
         @TestMetadata("InheritParameterName.kt")
         public void testInheritParameterName() throws Exception {
-            doTestKotlinAgainstCompiledJavaWithKotlin("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/InheritParameterName.kt");
+            doTestKotlinAgainstCompiledJavaWithKotlin(fileName);
         }
         
         @TestMetadata("javaRefersToKotlin.kt")
         public void testJavaRefersToKotlin() throws Exception {
-            doTestKotlinAgainstCompiledJavaWithKotlin("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/javaRefersToKotlin.kt");
+            doTestKotlinAgainstCompiledJavaWithKotlin(fileName);
         }
         
         @TestMetadata("propagationAgainstDeserializedSuperclass.kt")
         public void testPropagationAgainstDeserializedSuperclass() throws Exception {
-            doTestKotlinAgainstCompiledJavaWithKotlin("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin/propagationAgainstDeserializedSuperclass.kt");
+            doTestKotlinAgainstCompiledJavaWithKotlin(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/sourceJava")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SourceJava extends AbstractLoadJavaTest {
         public void testAllFilesPresentInSourceJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true);
@@ -4233,32 +4998,38 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
         
         @TestMetadata("ClassExtendsTypeParameter.java")
         public void testClassExtendsTypeParameter() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ClassExtendsTypeParameter.java");
+            doTestSourceJava(fileName);
         }
         
         @TestMetadata("ErrorTypes.java")
         public void testErrorTypes() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ErrorTypes.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ErrorTypes.java");
+            doTestSourceJava(fileName);
         }
         
         @TestMetadata("NullInAnnotation.java")
         public void testNullInAnnotation() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/NullInAnnotation.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/NullInAnnotation.java");
+            doTestSourceJava(fileName);
         }
         
         @TestMetadata("ReturnInnerSubclassOfSupersInner.java")
         public void testReturnInnerSubclassOfSupersInner() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnInnerSubclassOfSupersInner.java");
+            doTestSourceJava(fileName);
         }
         
         @TestMetadata("ReturnNotSubtype.java")
         public void testReturnNotSubtype() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java");
+            doTestSourceJava(fileName);
         }
         
         @TestMetadata("WrongNumberOfGenericParameters.java")
         public void testWrongNumberOfGenericParameters() throws Exception {
-            doTestSourceJava("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/sourceJava/WrongNumberOfGenericParameters.java");
+            doTestSourceJava(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java
index ef43ac2be17..6d55aa518f8 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jvm.compiler;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/writeSignature")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({WriteSignatureTestGenerated.Constructor.class, WriteSignatureTestGenerated.DeclarationSiteVariance.class, WriteSignatureTestGenerated.Nothing.class})
 public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
     public void testAllFilesPresentInWriteSignature() throws Exception {
@@ -36,75 +38,90 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
     
     @TestMetadata("ArrayOfCharSequence.kt")
     public void testArrayOfCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/ArrayOfCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ArrayOfInt.kt")
     public void testArrayOfInt() throws Exception {
-        doTest("compiler/testData/writeSignature/ArrayOfInt.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ArrayOfInt.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comparable.kt")
     public void testComparable() throws Exception {
-        doTest("compiler/testData/writeSignature/Comparable.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Comparable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Int.kt")
     public void testInt() throws Exception {
-        doTest("compiler/testData/writeSignature/Int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/Int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IntArray.kt")
     public void testIntArray() throws Exception {
-        doTest("compiler/testData/writeSignature/IntArray.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntArray.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IntQ.kt")
     public void testIntQ() throws Exception {
-        doTest("compiler/testData/writeSignature/IntQ.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/IntQ.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("jlString.kt")
     public void testJlString() throws Exception {
-        doTest("compiler/testData/writeSignature/jlString.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/jlString.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ListOfCharSequence.kt")
     public void testListOfCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/ListOfCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ListOfStar.kt")
     public void testListOfStar() throws Exception {
-        doTest("compiler/testData/writeSignature/ListOfStar.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/ListOfStar.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MapEntry.kt")
     public void testMapEntry() throws Exception {
-        doTest("compiler/testData/writeSignature/MapEntry.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MapEntry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MutableMapEntry.kt")
     public void testMutableMapEntry() throws Exception {
-        doTest("compiler/testData/writeSignature/MutableMapEntry.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/MutableMapEntry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NonGeneric.kt")
     public void testNonGeneric() throws Exception {
-        doTest("compiler/testData/writeSignature/NonGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/NonGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VarargCharSequence.kt")
     public void testVarargCharSequence() throws Exception {
-        doTest("compiler/testData/writeSignature/VarargCharSequence.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargCharSequence.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VarargGeneric.kt")
     public void testVarargGeneric() throws Exception {
-        doTest("compiler/testData/writeSignature/VarargGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/VarargGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/writeSignature/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructor extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/constructor"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -112,27 +129,32 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("Constructor0.kt")
         public void testConstructor0() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/Constructor0.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/Constructor0.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorCollectionParameter.kt")
         public void testConstructorCollectionParameter() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorCollectionParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParameter.kt")
         public void testConstructorWithTypeParameter() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParameterAndValueParameterP.kt")
         public void testConstructorWithTypeParameterAndValueParameterP() throws Exception {
-            doTest("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/constructor/ConstructorWithTypeParameterAndValueParameterP.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/writeSignature/declarationSiteVariance")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DeclarationSiteVariance extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInDeclarationSiteVariance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/declarationSiteVariance"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,117 +162,140 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("FunctionTwoTypeParameters.kt")
         public void testFunctionTwoTypeParameters() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/FunctionTwoTypeParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInInPosition.kt")
         public void testInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInOutPosition.kt")
         public void testInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfInInInPosition.kt")
         public void testInOfInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfInInOutPosition.kt")
         public void testInOfInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfInInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfOutInInPosition.kt")
         public void testInOfOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InOfOutInOutPosition.kt")
         public void testInOfOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/InOfOutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MappedSupertypeWithVariance.kt")
         public void testMappedSupertypeWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/MappedSupertypeWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutInInPosition.kt")
         public void testOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutInOutPosition.kt")
         public void testOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfInInInPosition.kt")
         public void testOutOfInInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfInInOutPosition.kt")
         public void testOutOfInInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfInInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfOutInInPosition.kt")
         public void testOutOfOutInInPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInInPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OutOfOutInOutPosition.kt")
         public void testOutOfOutInOutPosition() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/OutOfOutInOutPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterIn.kt")
         public void testPropertyGetterIn() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterOut.kt")
         public void testPropertyGetterOut() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterOut.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyGetterTwoParams.kt")
         public void testPropertyGetterTwoParams() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertyGetterTwoParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertySetterIn.kt")
         public void testPropertySetterIn() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertySetterOut.kt")
         public void testPropertySetterOut() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperClassWithVariance.kt")
         public void testSuperClassWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperClassWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperTraitWithVariance.kt")
         public void testSuperTraitWithVariance() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTraitWithVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperTypeWithVarianceInArguments.kt")
         public void testSuperTypeWithVarianceInArguments() throws Exception {
-            doTest("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/declarationSiteVariance/SuperTypeWithVarianceInArguments.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/writeSignature/nothing")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Nothing extends AbstractWriteSignatureTest {
         public void testAllFilesPresentInNothing() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/nothing"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -258,12 +303,14 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
         
         @TestMetadata("nothing.kt")
         public void testNothing() throws Exception {
-            doTest("compiler/testData/writeSignature/nothing/nothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nothing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableNothing.kt")
         public void testNullableNothing() throws Exception {
-            doTest("compiler/testData/writeSignature/nothing/nullableNothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/writeSignature/nothing/nullableNothing.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
index 52a03d1a470..5d1ee9a560b 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/renderer")
+@TestDataPath("$PROJECT_ROOT")
 public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest {
     public void testAllFilesPresentInRenderer() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,47 +37,56 @@ public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyReso
     
     @TestMetadata("Classes.kt")
     public void testClasses() throws Exception {
-        doTest("compiler/testData/renderer/Classes.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Enum.kt")
     public void testEnum() throws Exception {
-        doTest("compiler/testData/renderer/Enum.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ErrorType.kt")
     public void testErrorType() throws Exception {
-        doTest("compiler/testData/renderer/ErrorType.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionTypes.kt")
     public void testFunctionTypes() throws Exception {
-        doTest("compiler/testData/renderer/FunctionTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GlobalFunctions.kt")
     public void testGlobalFunctions() throws Exception {
-        doTest("compiler/testData/renderer/GlobalFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GlobalProperties.kt")
     public void testGlobalProperties() throws Exception {
-        doTest("compiler/testData/renderer/GlobalProperties.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedMembersVisibility.kt")
     public void testInheritedMembersVisibility() throws Exception {
-        doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KeywordsInNames.kt")
     public void testKeywordsInNames() throws Exception {
-        doTest("compiler/testData/renderer/KeywordsInNames.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("UnitType.kt")
     public void testUnitType() throws Exception {
-        doTest("compiler/testData/renderer/UnitType.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java
index 9962ba737f0..5ae77b1215f 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({LazyResolveRecursiveComparingTestGenerated.CompiledKotlin.class, LazyResolveRecursiveComparingTestGenerated.RecursiveComparator.class})
 public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyResolveRecursiveComparingTest {
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class})
     public static class CompiledKotlin extends AbstractLazyResolveRecursiveComparingTest {
         public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -37,6 +39,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class})
         public static class Annotations extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInAnnotations() throws Exception {
@@ -45,20 +48,24 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("AnnotatedAnnotation.kt")
             public void testAnnotatedAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnnotatedMethod.kt")
             public void testAnnotatedMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SimpleAnnotation.kt")
             public void testSimpleAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ClassMembers extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInClassMembers() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -66,42 +73,50 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ClassObjectPropertyField.kt")
                 public void testClassObjectPropertyField() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Getter.kt")
                 public void testGetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertyField.kt")
                 public void testPropertyField() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Setter.kt")
                 public void testSetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Classes extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInClasses() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -109,77 +124,92 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("AnnotationInClassObject.kt")
                 public void testAnnotationInClassObject() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassInClassObject.kt")
                 public void testClassInClassObject() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassObject.kt")
                 public void testClassObject() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassObjectInStaticNestedClass.kt")
                 public void testClassObjectInStaticNestedClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Deprecated.kt")
                 public void testDeprecated() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("DollarsInAnnotationName.kt")
                 public void testDollarsInAnnotationName() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MultipleAnnotations.kt")
                 public void testMultipleAnnotations() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NestedAnnotation.kt")
                 public void testNestedAnnotation() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NestedClass.kt")
                 public void testNestedClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Retention.kt")
                 public void testRetention() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Simple.kt")
                 public void testSimple() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WithArgument.kt")
                 public void testWithArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WithMultipleArguments.kt")
                 public void testWithMultipleArguments() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PackageMembers extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInPackageMembers() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -187,47 +217,56 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("DelegatedProperty.kt")
                 public void testDelegatedProperty() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EnumArgument.kt")
                 public void testEnumArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EnumArrayArgument.kt")
                 public void testEnumArrayArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Function.kt")
                 public void testFunction() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Getter.kt")
                 public void testGetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertyField.kt")
                 public void testPropertyField() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Setter.kt")
                 public void testSetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("StringArrayArgument.kt")
                 public void testStringArrayArgument() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Parameters extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInParameters() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -235,62 +274,74 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("Constructor.kt")
                 public void testConstructor() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("EnumConstructor.kt")
                 public void testEnumConstructor() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtensionFunction.kt")
                 public void testExtensionFunction() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtensionFunctionInClass.kt")
                 public void testExtensionFunctionInClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtensionPropertySetter.kt")
                 public void testExtensionPropertySetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunctionInClass.kt")
                 public void testFunctionInClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunctionInTrait.kt")
                 public void testFunctionInTrait() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ManyAnnotations.kt")
                 public void testManyAnnotations() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertySetterInClass.kt")
                 public void testPropertySetterInClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("TopLevelFunction.kt")
                 public void testTopLevelFunction() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("TopLevelPropertySetter.kt")
                 public void testTopLevelPropertySetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PropertiesWithoutBackingFields extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -298,42 +349,50 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("Class.kt")
                 public void testClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassObject.kt")
                 public void testClassObject() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtensionsWithSameNameClass.kt")
                 public void testExtensionsWithSameNameClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtensionsWithSameNamePackage.kt")
                 public void testExtensionsWithSameNamePackage() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NestedTrait.kt")
                 public void testNestedTrait() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("TopLevel.kt")
                 public void testTopLevel() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Trait.kt")
                 public void testTrait() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("TraitClassObject.kt")
                 public void testTraitClassObject() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -351,6 +410,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Class.JavaBean.class})
         public static class Class extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInClass() throws Exception {
@@ -359,170 +419,204 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("Class.kt")
             public void testClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassInParam.kt")
             public void testClassInParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassInnerClass.kt")
             public void testClassInnerClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassMemberConflict.kt")
             public void testClassMemberConflict() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassOutParam.kt")
             public void testClassOutParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParam.kt")
             public void testClassParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamReferencesParam.kt")
             public void testClassParamReferencesParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamReferencesParam2.kt")
             public void testClassParamReferencesParam2() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamReferencesSelf.kt")
             public void testClassParamReferencesSelf() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamUpperClassBound.kt")
             public void testClassParamUpperClassBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamUpperClassInterfaceBound.kt")
             public void testClassParamUpperClassInterfaceBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamUpperInterfaceBound.kt")
             public void testClassParamUpperInterfaceBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassTwoParams.kt")
             public void testClassTwoParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassTwoParams2.kt")
             public void testClassTwoParams2() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumWithGenericConstructorParameter.kt")
             public void testEnumWithGenericConstructorParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
             public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritClassSimple.kt")
             public void testInheritClassSimple() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritClassWithParam.kt")
             public void testInheritClassWithParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritSubstitutedMethod.kt")
             public void testInheritSubstitutedMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritTraitWithFunctionParam.kt")
             public void testInheritTraitWithFunctionParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritTraitWithParam.kt")
             public void testInheritTraitWithParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerClassExtendInnerClass.kt")
             public void testInnerClassExtendInnerClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerGenericClass.kt")
             public void testInnerGenericClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedObject.kt")
             public void testNamedObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedObjectInClass.kt")
             public void testNamedObjectInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedObjectInClassObject.kt")
             public void testNamedObjectInClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedObjectInNamedObject.kt")
             public void testNamedObjectInNamedObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt")
             public void testNamedObjectWithAnotherTopLevelProperty() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedClassExtendNestedClass.kt")
             public void testNestedClassExtendNestedClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedGenericClass.kt")
             public void testNestedGenericClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SingleAbstractMethod.kt")
             public void testSingleAbstractMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean")
+            @TestDataPath("$PROJECT_ROOT")
             public static class JavaBean extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInJavaBean() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -530,32 +624,38 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("DifferentGetterAndSetter.kt")
                 public void testDifferentGetterAndSetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("JavaBeanAbstractGetter.kt")
                 public void testJavaBeanAbstractGetter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVal.kt")
                 public void testJavaBeanVal() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVar.kt")
                 public void testJavaBeanVar() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("JavaBeanVarOfGenericType.kt")
                 public void testJavaBeanVarOfGenericType() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("TwoSetters.kt")
                 public void testTwoSetters() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -569,6 +669,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassFun extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInClassFun() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -576,37 +677,44 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("ClassInParamUsedInFun.kt")
             public void testClassInParamUsedInFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassParamUsedInFun.kt")
             public void testClassParamUsedInFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunDelegationToTraitImpl.kt")
             public void testFunDelegationToTraitImpl() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunInParamSuper.kt")
             public void testFunInParamSuper() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitFinalFun.kt")
             public void testTraitFinalFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitOpenFun.kt")
             public void testTraitOpenFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassObject extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInClassObject() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -614,67 +722,80 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("ClassObjectDeclaresVal.kt")
             public void testClassObjectDeclaresVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectDeclaresVar.kt")
             public void testClassObjectDeclaresVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectDefaultVisibility.kt")
             public void testClassObjectDefaultVisibility() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectExplicitVisibility.kt")
             public void testClassObjectExplicitVisibility() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectExtendsTrait.kt")
             public void testClassObjectExtendsTrait() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectExtendsTraitWithTP.kt")
             public void testClassObjectExtendsTraitWithTP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObjectInClassStaticFields.kt")
             public void testClassObjectInClassStaticFields() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObjectInTraitStaticFields.kt")
             public void testClassObjectInTraitStaticFields() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectPropertyInClass.kt")
             public void testClassObjectPropertyInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Delegation.kt")
             public void testDelegation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerClassInClassObject.kt")
             public void testInnerClassInClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("SimpleClassObject.kt")
             public void testSimpleClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Constructor.Vararg.class})
         public static class Constructor extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInConstructor() throws Exception {
@@ -683,85 +804,102 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("Constructor0.kt")
             public void testConstructor0() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constructor1.kt")
             public void testConstructor1() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constructor1WithParamDefaultValue.kt")
             public void testConstructor1WithParamDefaultValue() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constructor2WithOneParamDefaultValue.kt")
             public void testConstructor2WithOneParamDefaultValue() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorCollectionParameter.kt")
             public void testConstructorCollectionParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorGenericDeep.kt")
             public void testConstructorGenericDeep() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorGenericSimple.kt")
             public void testConstructorGenericSimple() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorGenericUpperBound.kt")
             public void testConstructorGenericUpperBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoDefArgs.kt")
             public void testConstructorWithTwoDefArgs() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParameters.kt")
             public void testConstructorWithTwoTypeParameters() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt")
             public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTypeParameter.kt")
             public void testConstructorWithTypeParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt")
             public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerClassConstructorWithDefArgs.kt")
             public void testInnerClassConstructorWithDefArgs() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt")
             public void testPrivateConstructor1WithParamDefaultValue() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Vararg extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInVararg() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -769,12 +907,14 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ConstructorNonLastVararg.kt")
                 public void testConstructorNonLastVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ConstructorVararg.kt")
                 public void testConstructorVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -788,6 +928,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DataClass extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInDataClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -795,42 +936,50 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("MixedComponents.kt")
             public void testMixedComponents() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoComponents.kt")
             public void testNoComponents() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OneVal.kt")
             public void testOneVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OpenDataClass.kt")
             public void testOpenDataClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OpenPropertyFinalComponent.kt")
             public void testOpenPropertyFinalComponent() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TwoVals.kt")
             public void testTwoVals() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TwoVars.kt")
             public void testTwoVars() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Enum extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInEnum() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -838,32 +987,38 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("enumVisibility.kt")
             public void testEnumVisibility() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enumWithConstuctor.kt")
             public void testEnumWithConstuctor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerEnum.kt")
             public void testInnerEnum() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("innerEnumExistingClassObject.kt")
             public void testInnerEnumExistingClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleEnum.kt")
             public void testSimpleEnum() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class})
         public static class FromLoadJava extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInFromLoadJava() throws Exception {
@@ -872,180 +1027,216 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("ArrayTypeVariance.kt")
             public void testArrayTypeVariance() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassDoesNotOverrideMethod.kt")
             public void testClassDoesNotOverrideMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObjectAnnotation.kt")
             public void testClassObjectAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithConstVal.kt")
             public void testClassWithConstVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypeP.kt")
             public void testClassWithTypeP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypePExtendsIterableP.kt")
             public void testClassWithTypePExtendsIterableP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypePP.kt")
             public void testClassWithTypePP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefNext.kt")
             public void testClassWithTypePRefNext() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefSelf.kt")
             public void testClassWithTypePRefSelf() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassWithTypePRefSelfAndClass.kt")
             public void testClassWithTypePRefSelfAndClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FieldAsVar.kt")
             public void testFieldAsVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FieldOfArrayType.kt")
             public void testFieldOfArrayType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FinalFieldAsVal.kt")
             public void testFinalFieldAsVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericFunction.kt")
             public void testGenericFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypes.kt")
             public void testInheritMethodsDifferentReturnTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt")
             public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InnerClass.kt")
             public void testInnerClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodTypePOneUpperBound.kt")
             public void testMethodTypePOneUpperBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodTypePTwoUpperBounds.kt")
             public void testMethodTypePTwoUpperBounds() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithTypeP.kt")
             public void testMethodWithTypeP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithTypePP.kt")
             public void testMethodWithTypePP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithTypePRefClassP.kt")
             public void testMethodWithTypePRefClassP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethosWithPRefTP.kt")
             public void testMethosWithPRefTP() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MyException.kt")
             public void testMyException() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectInClass.kt")
             public void testObjectInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectMembers.kt")
             public void testObjectMembers() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("packageLevelObject.kt")
             public void testPackageLevelObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("RemoveRedundantProjectionKind.kt")
             public void testRemoveRedundantProjectionKind() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TwoFields.kt")
             public void testTwoFields() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("UnboundWildcard.kt")
             public void testUnboundWildcard() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
             public static class KotlinSignature extends AbstractLazyResolveRecursiveComparingTest {
                 @TestMetadata("AllBoundsInWhen.kt")
                 public void testAllBoundsInWhen() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                    doTest(fileName);
                 }
                 
                 public void testAllFilesPresentInKotlinSignature() throws Exception {
@@ -1054,84 +1245,101 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ArrayType.kt")
                 public void testArrayType() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithNewTypeParams.kt")
                 public void testConstructorWithNewTypeParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithParentTypeParams.kt")
                 public void testConstructorWithParentTypeParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithSeveralParams.kt")
                 public void testConstructorWithSeveralParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ConstructorWithoutParams.kt")
                 public void testConstructorWithoutParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("CustomProjectionKind.kt")
                 public void testCustomProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MethodWithFunctionTypes.kt")
                 public void testMethodWithFunctionTypes() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MethodWithGenerics.kt")
                 public void testMethodWithGenerics() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MethodWithMappedClasses.kt")
                 public void testMethodWithMappedClasses() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MethodWithTypeParameters.kt")
                 public void testMethodWithTypeParameters() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MethodWithVararg.kt")
                 public void testMethodWithVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertyArrayTypes.kt")
                 public void testPropertyArrayTypes() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertyComplexTypes.kt")
                 public void testPropertyComplexTypes() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("PropertySimpleType.kt")
                 public void testPropertySimpleType() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("StarProjection.kt")
                 public void testStarProjection() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Error extends AbstractLazyResolveRecursiveComparingTest {
                     @TestMetadata("AddingNullability.kt")
                     public void testAddingNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                        doTest(fileName);
                     }
                     
                     public void testAllFilesPresentInError() throws Exception {
@@ -1140,137 +1348,164 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                     
                     @TestMetadata("ConflictingProjectionKind.kt")
                     public void testConflictingProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("ExplicitFieldGettersAndSetters.kt")
                     public void testExplicitFieldGettersAndSetters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("ExtraUpperBound.kt")
                     public void testExtraUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MissingUpperBound.kt")
                     public void testMissingUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("NoFieldTypeRef.kt")
                     public void testNoFieldTypeRef() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("NotVarargReplacedWithVararg.kt")
                     public void testNotVarargReplacedWithVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("RedundantProjectionKind.kt")
                     public void testRedundantProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("ReturnTypeMissing.kt")
                     public void testReturnTypeMissing() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SyntaxError.kt")
                     public void testSyntaxError() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SyntaxErrorInFieldAnnotation.kt")
                     public void testSyntaxErrorInFieldAnnotation() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("VarargReplacedWithNotVararg.kt")
                     public void testVarargReplacedWithNotVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongFieldInitializer.kt")
                     public void testWrongFieldInitializer() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongFieldMutability.kt")
                     public void testWrongFieldMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongFieldName.kt")
                     public void testWrongFieldName() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongMethodName.kt")
                     public void testWrongMethodName() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongProjectionKind.kt")
                     public void testWrongProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongReturnTypeStructure.kt")
                     public void testWrongReturnTypeStructure() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName1.kt")
                     public void testWrongTypeName1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName2.kt")
                     public void testWrongTypeName2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeName3.kt")
                     public void testWrongTypeName3() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParameterBoundStructure1.kt")
                     public void testWrongTypeParameterBoundStructure1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParameterBoundStructure2.kt")
                     public void testWrongTypeParameterBoundStructure2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongTypeParametersCount.kt")
                     public void testWrongTypeParametersCount() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongValueParameterStructure1.kt")
                     public void testWrongValueParameterStructure1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongValueParameterStructure2.kt")
                     public void testWrongValueParameterStructure2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("WrongValueParametersCount.kt")
                     public void testWrongValueParametersCount() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                        doTest(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
+                @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
                 public static class Propagation extends AbstractLazyResolveRecursiveComparingTest {
                     public void testAllFilesPresentInPropagation() throws Exception {
@@ -1279,10 +1514,12 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                     
                     @TestMetadata("PropagateTypeArgumentNullable.kt")
                     public void testPropagateTypeArgumentNullable() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class Parameter extends AbstractLazyResolveRecursiveComparingTest {
                         public void testAllFilesPresentInParameter() throws Exception {
                             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1290,166 +1527,199 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                         
                         @TestMetadata("ChangeProjectionKind1.kt")
                         public void testChangeProjectionKind1() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("ChangeProjectionKind2.kt")
                         public void testChangeProjectionKind2() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter.kt")
                         public void testDeeplySubstitutedClassParameter() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                         public void testDeeplySubstitutedClassParameter2() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritMutability.kt")
                         public void testInheritMutability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNotVararg.kt")
                         public void testInheritNotVararg() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargInteger.kt")
                         public void testInheritNotVarargInteger() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargNotNull.kt")
                         public void testInheritNotVarargNotNull() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNotVarargPrimitive.kt")
                         public void testInheritNotVarargPrimitive() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullability.kt")
                         public void testInheritNullability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritProjectionKind.kt")
                         public void testInheritProjectionKind() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnliness.kt")
                         public void testInheritReadOnliness() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritVararg.kt")
                         public void testInheritVararg() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritVarargInteger.kt")
                         public void testInheritVarargInteger() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritVarargNotNull.kt")
                         public void testInheritVarargNotNull() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritVarargPrimitive.kt")
                         public void testInheritVarargPrimitive() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("Kt3302.kt")
                         public void testKt3302() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("MutableToReadOnly.kt")
                         public void testMutableToReadOnly() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("NotNullToNullable.kt")
                         public void testNotNullToNullable() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("NullableToNotNull.kt")
                         public void testNullableToNotNull() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("NullableToNotNullKotlinSignature.kt")
                         public void testNullableToNotNullKotlinSignature() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("OverrideWithErasedParameter.kt")
                         public void testOverrideWithErasedParameter() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("ReadOnlyToMutable.kt")
                         public void testReadOnlyToMutable() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubclassFromGenericAndNot.kt")
                         public void testSubclassFromGenericAndNot() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameter.kt")
                         public void testSubstitutedClassParameter() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameters.kt")
                         public void testSubstitutedClassParameters() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                            doTest(fileName);
                         }
                         
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class Return extends AbstractLazyResolveRecursiveComparingTest {
                         @TestMetadata("AddNotNullJavaSubtype.kt")
                         public void testAddNotNullJavaSubtype() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("AddNotNullSameJavaType.kt")
                         public void testAddNotNullSameJavaType() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("AddNullabilityJavaSubtype.kt")
                         public void testAddNullabilityJavaSubtype() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameGenericType1.kt")
                         public void testAddNullabilitySameGenericType1() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameGenericType2.kt")
                         public void testAddNullabilitySameGenericType2() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("AddNullabilitySameJavaType.kt")
                         public void testAddNullabilitySameJavaType() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                            doTest(fileName);
                         }
                         
                         public void testAllFilesPresentInReturn() throws Exception {
@@ -1458,147 +1728,176 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                         
                         @TestMetadata("CantMakeImmutableInSubclass.kt")
                         public void testCantMakeImmutableInSubclass() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter.kt")
                         public void testDeeplySubstitutedClassParameter() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                         public void testDeeplySubstitutedClassParameter2() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("HalfSubstitutedTypeParameters.kt")
                         public void testHalfSubstitutedTypeParameters() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilityGenericSubclassSimple.kt")
                         public void testInheritNullabilityGenericSubclassSimple() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilityJavaSubtype.kt")
                         public void testInheritNullabilityJavaSubtype() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilitySameGenericType.kt")
                         public void testInheritNullabilitySameGenericType() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullabilitySameJavaType.kt")
                         public void testInheritNullabilitySameJavaType() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritProjectionKind.kt")
                         public void testInheritProjectionKind() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessOfArgument.kt")
                         public void testInheritReadOnlinessOfArgument() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessSameClass.kt")
                         public void testInheritReadOnlinessSameClass() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnlinessSubclass.kt")
                         public void testInheritReadOnlinessSubclass() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SameProjectionKind.kt")
                         public void testSameProjectionKind() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubclassFromGenericAndNot.kt")
                         public void testSubclassFromGenericAndNot() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubclassOfCollection.kt")
                         public void testSubclassOfCollection() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubclassOfMapEntry.kt")
                         public void testSubclassOfMapEntry() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameter.kt")
                         public void testSubstitutedClassParameter() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("SubstitutedClassParameters.kt")
                         public void testSubstitutedClassParameters() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt")
                         public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt")
                         public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt")
                         public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesMutableAndNot.kt")
                         public void testTwoSuperclassesMutableAndNot() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt")
                         public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesReturnSameJavaType.kt")
                         public void testTwoSuperclassesReturnSameJavaType() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclassesSupplementNotNull.kt")
                         public void testTwoSuperclassesSupplementNotNull() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfClass.kt")
                         public void testTypeParamOfClass() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfClassSubstituted.kt")
                         public void testTypeParamOfClassSubstituted() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TypeParamOfFun.kt")
                         public void testTypeParamOfFun() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                            doTest(fileName);
                         }
                         
                     }
                     
                     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter")
+                    @TestDataPath("$PROJECT_ROOT")
                     public static class TypeParameter extends AbstractLazyResolveRecursiveComparingTest {
                         public void testAllFilesPresentInTypeParameter() throws Exception {
                             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1606,47 +1905,56 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                         
                         @TestMetadata("InheritMutability.kt")
                         public void testInheritMutability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritNullability.kt")
                         public void testInheritNullability() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("InheritReadOnliness.kt")
                         public void testInheritReadOnliness() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoBounds.kt")
                         public void testTwoBounds() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoSuperclasses.kt")
                         public void testTwoSuperclasses() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("TwoTypeParameters.kt")
                         public void testTwoTypeParameters() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("UseParameterAsUpperBound.kt")
                         public void testUseParameterAsUpperBound() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("UseParameterInUpperBound.kt")
                         public void testUseParameterInUpperBound() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                            doTest(fileName);
                         }
                         
                         @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt")
                         public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
-                            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                            doTest(fileName);
                         }
                         
                     }
@@ -1671,6 +1979,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Library extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInLibrary() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1678,22 +1987,26 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("LoadIterable.kt")
                 public void testLoadIterable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("LoadIterator.kt")
                 public void testLoadIterator() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("Max.kt")
                 public void testMax() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Modality extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInModality() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1701,12 +2014,14 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ModalityOfFakeOverrides.kt")
                 public void testModalityOfFakeOverrides() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NotNull extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInNotNull() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1714,27 +2029,32 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("NotNullField.kt")
                 public void testNotNullField() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NotNullIntArray.kt")
                 public void testNotNullIntArray() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NotNullMethod.kt")
                 public void testNotNullMethod() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NotNullObjectArray.kt")
                 public void testNotNullObjectArray() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NotNullParameter.kt")
                 public void testNotNullParameter() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1751,6 +2071,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class})
         public static class Fun extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInFun() throws Exception {
@@ -1759,55 +2080,66 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("Assert.kt")
             public void testAssert() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DeclaredMemberOverridesDelegated.kt")
             public void testDeclaredMemberOverridesDelegated() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt")
             public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritValAndVar.kt")
             public void testInheritValAndVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InheritValsDifferentTypes.kt")
             public void testInheritValsDifferentTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoDelegationForFunctionInheritedFromTraitSuperClass.kt")
             public void testNoDelegationForFunctionInheritedFromTraitSuperClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoSamAdapter.kt")
             public void testNoSamAdapter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoSamConstructor.kt")
             public void testNoSamConstructor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropagateDeepSubclass.kt")
             public void testPropagateDeepSubclass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropagateSubclassOfComparable.kt")
             public void testPropagateSubclassOfComparable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables")
+            @TestDataPath("$PROJECT_ROOT")
             public static class GenericWithTypeVariables extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1815,57 +2147,68 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("FunGenericParam.kt")
                 public void testFunGenericParam() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamParam.kt")
                 public void testFunParamParam() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamParamErased.kt")
                 public void testFunParamParamErased() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamReferencesParam.kt")
                 public void testFunParamReferencesParam() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamTwoUpperBounds.kt")
                 public void testFunParamTwoUpperBounds() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperClassBound.kt")
                 public void testFunParamUpperClassBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperClassInterfaceBound.kt")
                 public void testFunParamUpperClassInterfaceBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamUpperInterfaceBound.kt")
                 public void testFunParamUpperInterfaceBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamVaragParam.kt")
                 public void testFunParamVaragParam() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunTwoTypeParams.kt")
                 public void testFunTwoTypeParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables")
+            @TestDataPath("$PROJECT_ROOT")
             public static class GenericWithoutTypeVariables extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1873,32 +2216,38 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("FunClassParamNotNull.kt")
                 public void testFunClassParamNotNull() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunClassParamNullable.kt")
                 public void testFunClassParamNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamNullable.kt")
                 public void testFunParamNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNotNull.kt")
                 public void testReturnTypeClassParamNotNull() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeClassParamNullable.kt")
                 public void testReturnTypeClassParamNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NonGeneric extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInNonGeneric() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1906,87 +2255,104 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ClassFun.kt")
                 public void testClassFun() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassFunGetFoo.kt")
                 public void testClassFunGetFoo() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassFunGetFooSetFoo.kt")
                 public void testClassFunGetFooSetFoo() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassFunSetFoo.kt")
                 public void testClassFunSetFoo() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtFun.kt")
                 public void testExtFun() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtFunInClass.kt")
                 public void testExtFunInClass() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunDefaultArg.kt")
                 public void testFunDefaultArg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunParamNotNull.kt")
                 public void testFunParamNotNull() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunVarargInt.kt")
                 public void testFunVarargInt() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("FunVarargInteger.kt")
                 public void testFunVarargInteger() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ModifierAbstract.kt")
                 public void testModifierAbstract() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ModifierOpen.kt")
                 public void testModifierOpen() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NsFun.kt")
                 public void testNsFun() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NsFunGetFoo.kt")
                 public void testNsFunGetFoo() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeNotNull.kt")
                 public void testReturnTypeNotNull() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeNullable.kt")
                 public void testReturnTypeNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Vararg extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInVararg() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1994,17 +2360,20 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("nonLastVararg.kt")
                 public void testNonLastVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("VarargInt.kt")
                 public void testVarargInt() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("VarargString.kt")
                 public void testVarargString() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2021,6 +2390,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Inline extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInInline() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2028,12 +2398,14 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("inlineFunction.kt")
             public void testInlineFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Prop.DefaultAccessors.class})
         public static class Prop extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInProp() throws Exception {
@@ -2042,165 +2414,198 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("ClassVal.kt")
             public void testClassVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassValAbstract.kt")
             public void testClassValAbstract() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVar.kt")
             public void testClassVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CollectionSize.kt")
             public void testCollectionSize() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Constants.kt")
             public void testConstants() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValClass.kt")
             public void testExtValClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValInClass.kt")
             public void testExtValInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValInt.kt")
             public void testExtValInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValIntCharSequence.kt")
             public void testExtValIntCharSequence() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValIntCharSequenceQ.kt")
             public void testExtValIntCharSequenceQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValIntListQOfIntInClass.kt")
             public void testExtValIntListQOfIntInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValIntTInClass.kt")
             public void testExtValIntTInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValIntTQInClass.kt")
             public void testExtValIntTQInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValTIntInClass.kt")
             public void testExtValTIntInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarClass.kt")
             public void testExtVarClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarInClass.kt")
             public void testExtVarInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarInt.kt")
             public void testExtVarInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarIntTInClass.kt")
             public void testExtVarIntTInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarIntTQInClass.kt")
             public void testExtVarIntTQInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarMapPQInt.kt")
             public void testExtVarMapPQInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarTIntInClass.kt")
             public void testExtVarTIntInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarTQIntInClass.kt")
             public void testExtVarTQIntInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarl.kt")
             public void testExtVarl() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NsVal.kt")
             public void testNsVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NsVar.kt")
             public void testNsVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideClassVal.kt")
             public void testOverrideClassVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OverrideTraitVal.kt")
             public void testOverrideTraitVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropFromSuperclass.kt")
             public void testPropFromSuperclass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitFinalVar.kt")
             public void testTraitFinalVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitOpenVal.kt")
             public void testTraitOpenVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VarDelegationToTraitImpl.kt")
             public void testVarDelegationToTraitImpl() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VarWithDelegated.kt")
             public void testVarWithDelegated() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DefaultAccessors extends AbstractLazyResolveRecursiveComparingTest {
                 public void testAllFilesPresentInDefaultAccessors() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2208,52 +2613,62 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
                 
                 @TestMetadata("ClassVal.kt")
                 public void testClassVal() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassValParams.kt")
                 public void testClassValParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassValWithGet.kt")
                 public void testClassValWithGet() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassVar.kt")
                 public void testClassVar() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassVarModality.kt")
                 public void testClassVarModality() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassVarParams.kt")
                 public void testClassVarParams() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassVarWithGet.kt")
                 public void testClassVarWithGet() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ClassVarWithSet.kt")
                 public void testClassVarWithSet() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtValLong.kt")
                 public void testExtValLong() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtVarLong.kt")
                 public void testExtVarLong() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2267,6 +2682,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/type")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Type extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInType() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2274,152 +2690,182 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("Any.kt")
             public void testAny() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AnyQ.kt")
             public void testAnyQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfInNumber.kt")
             public void testArrayOfInNumber() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfInt.kt")
             public void testArrayOfInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfInteger.kt")
             public void testArrayOfInteger() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfOutNumber.kt")
             public void testArrayOfOutNumber() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfOutT.kt")
             public void testArrayOfOutT() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ArrayOfString.kt")
             public void testArrayOfString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Function1IntString.kt")
             public void testFunction1IntString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Int.kt")
             public void testInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntArray.kt")
             public void testIntArray() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IntQ.kt")
             public void testIntQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlInteger.kt")
             public void testJlInteger() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlIntegerQ.kt")
             public void testJlIntegerQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlNumber.kt")
             public void testJlNumber() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlObject.kt")
             public void testJlObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlObjectQ.kt")
             public void testJlObjectQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlString.kt")
             public void testJlString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("jlStringQ.kt")
             public void testJlStringQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ListOfAny.kt")
             public void testListOfAny() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ListOfAnyQ.kt")
             public void testListOfAnyQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ListOfStar.kt")
             public void testListOfStar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ListOfString.kt")
             public void testListOfString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ListOfjlString.kt")
             public void testListOfjlString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Nothing.kt")
             public void testNothing() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NothingQ.kt")
             public void testNothingQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("String.kt")
             public void testString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("StringQ.kt")
             public void testStringQ() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Unit.kt")
             public void testUnit() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Visibility extends AbstractLazyResolveRecursiveComparingTest {
             public void testAllFilesPresentInVisibility() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2427,67 +2873,80 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
             
             @TestMetadata("InternalAbstractTraitMembersOverridden.kt")
             public void testInternalAbstractTraitMembersOverridden() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InternalClass.kt")
             public void testInternalClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InternalConstructor.kt")
             public void testInternalConstructor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InternalTopLevelMembers.kt")
             public void testInternalTopLevelMembers() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InternalTraitMembers.kt")
             public void testInternalTraitMembers() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InternalTraitMembersInherited.kt")
             public void testInternalTraitMembersInherited() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PrivateClass.kt")
             public void testPrivateClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PrivateClassMembers.kt")
             public void testPrivateClassMembers() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PrivateTopLevelFun.kt")
             public void testPrivateTopLevelFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PrivateTopLevelVal.kt")
             public void testPrivateTopLevelVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyInConstructor.kt")
             public void testPropertyInConstructor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyInConstructorExplicitVisibility.kt")
             public void testPropertyInConstructorExplicitVisibility() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevelVarWithPrivateSetter.kt")
             public void testTopLevelVarWithPrivateSetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+                doTest(fileName);
             }
             
         }
@@ -2513,6 +2972,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
     }
     
     @TestMetadata("compiler/testData/lazyResolve/recursiveComparator")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RecursiveComparator extends AbstractLazyResolveRecursiveComparingTest {
         public void testAllFilesPresentInRecursiveComparator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lazyResolve/recursiveComparator"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2520,77 +2980,92 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso
         
         @TestMetadata("AnnotationOnObject.kt")
         public void testAnnotationOnObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/AnnotationOnObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectHeader.kt")
         public void testClassObjectHeader() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/classObjectHeader.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CyclicHierarchy.kt")
         public void testCyclicHierarchy() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/CyclicHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/CyclicHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("fileDependencyRecursion.kt")
         public void testFileDependencyRecursion() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/fileDependencyRecursion.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("importFunctionWithAllUnderImport.kt")
         public void testImportFunctionWithAllUnderImport() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("importFunctionWithAllUnderImportAfterNamedImport.kt")
         public void testImportFunctionWithAllUnderImportAfterNamedImport() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/importFunctionWithAllUnderImportAfterNamedImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassNameClash.kt")
         public void testInnerClassNameClash() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/InnerClassNameClash.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideWithErrors.kt")
         public void testOverrideWithErrors() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/OverrideWithErrors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyClassFileDependencyRecursion.kt")
         public void testPropertyClassFileDependencyRecursion() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/propertyClassFileDependencyRecursion.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("resolveFunctionInsideClassObject.kt")
         public void testResolveFunctionInsideClassObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/resolveFunctionInsideClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("sameClassNameResolve.kt")
         public void testSameClassNameResolve() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/sameClassNameResolve.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleClass.kt")
         public void testSimpleClass() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/simpleClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/simpleClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnresolvedAnnotationOnObject.kt")
         public void testUnresolvedAnnotationOnObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/UnresolvedAnnotationOnObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("varargIterator.kt")
         public void testVarargIterator() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/varargIterator.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/varargIterator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WrongAnnotationArgsOnObject.kt")
         public void testWrongAnnotationArgsOnObject() throws Exception {
-            doTest("compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/lazyResolve/recursiveComparator/WrongAnnotationArgsOnObject.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java
index 15007336d1b..0624df17355 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.lazy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolve/imports")
+@TestDataPath("$PROJECT_ROOT")
 public class LazyResolveTestGenerated extends AbstractLazyResolveTest {
     public void testAllFilesPresentInImports() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), false);
@@ -35,62 +37,74 @@ public class LazyResolveTestGenerated extends AbstractLazyResolveTest {
     
     @TestMetadata("ImportConflictAllPackage.resolve")
     public void testImportConflictAllPackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictBetweenImportedAndRootPackage.resolve")
     public void testImportConflictBetweenImportedAndRootPackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictBetweenImportedAndSamePackage.resolve")
     public void testImportConflictBetweenImportedAndSamePackage() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictForFunctions.resolve")
     public void testImportConflictForFunctions() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictPackageAndClass.resolve")
     public void testImportConflictPackageAndClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictSameNameClass.resolve")
     public void testImportConflictSameNameClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithClassObject.resolve")
     public void testImportConflictWithClassObject() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithInFileClass.resolve")
     public void testImportConflictWithInFileClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictWithInnerClass.resolve")
     public void testImportConflictWithInnerClass() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportConflictsWithMappedToJava.resolve")
     public void testImportConflictsWithMappedToJava() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportNonBlockingAnalysis.resolve")
     public void testImportNonBlockingAnalysis() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportResolveOrderStable.resolve")
     public void testImportResolveOrderStable() throws Exception {
-        doTest("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java
index bdb0b052ce1..629efb4d241 100644
--- a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.modules.xml;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/modules.xml")
+@TestDataPath("$PROJECT_ROOT")
 public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest {
     public void testAllFilesPresentInModules_xml() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/modules.xml"), Pattern.compile("^(.+)\\.xml$"), true);
@@ -35,37 +37,44 @@ public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest {
     
     @TestMetadata("allOnce.xml")
     public void testAllOnce() throws Exception {
-        doTest("compiler/testData/modules.xml/allOnce.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/allOnce.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("comments.xml")
     public void testComments() throws Exception {
-        doTest("compiler/testData/modules.xml/comments.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/comments.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("empty.xml")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/modules.xml/empty.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/empty.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("emptyModule.xml")
     public void testEmptyModule() throws Exception {
-        doTest("compiler/testData/modules.xml/emptyModule.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/emptyModule.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("manyTimes.xml")
     public void testManyTimes() throws Exception {
-        doTest("compiler/testData/modules.xml/manyTimes.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/manyTimes.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("onlySources.xml")
     public void testOnlySources() throws Exception {
-        doTest("compiler/testData/modules.xml/onlySources.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/onlySources.xml");
+        doTest(fileName);
     }
     
     @TestMetadata("twoModules.xml")
     public void testTwoModules() throws Exception {
-        doTest("compiler/testData/modules.xml/twoModules.xml");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/modules.xml/twoModules.xml");
+        doTest(fileName);
     }
     
 }
diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
index f4ad63e29df..0bfc8129be3 100644
--- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.parsing;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,11 +31,13 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetParsingTestGenerated.Psi.class, JetParsingTestGenerated.Expression.class, JetParsingTestGenerated.Block.class})
 public class JetParsingTestGenerated extends AbstractJetParsingTest {
     @TestMetadata("compiler/testData/psi")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Psi.Examples.class, Psi.FunctionReceivers.class, Psi.GreatSyntacticShift.class, Psi.Kdoc.class, Psi.PropertyDelegate.class, Psi.Recovery.class, Psi.Script.class, Psi.StringTemplates.class})
     public static class Psi extends AbstractJetParsingTest {
         @TestMetadata("AbsentInnerType.kt")
         public void testAbsentInnerType() throws Exception {
-            doParsingTest("compiler/testData/psi/AbsentInnerType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AbsentInnerType.kt");
+            doParsingTest(fileName);
         }
         
         public void testAllFilesPresentInPsi() throws Exception {
@@ -43,420 +46,504 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         
         @TestMetadata("AnnotatedExpressions.kt")
         public void testAnnotatedExpressions() throws Exception {
-            doParsingTest("compiler/testData/psi/AnnotatedExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AnnotatedExpressions.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("AnonymousInitializer.kt")
         public void testAnonymousInitializer() throws Exception {
-            doParsingTest("compiler/testData/psi/AnonymousInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AnonymousInitializer.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("AssertNotNull.kt")
         public void testAssertNotNull() throws Exception {
-            doParsingTest("compiler/testData/psi/AssertNotNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AssertNotNull.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Attributes.kt")
         public void testAttributes() throws Exception {
-            doParsingTest("compiler/testData/psi/Attributes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Attributes.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("AttributesOnPatterns.kt")
         public void testAttributesOnPatterns() throws Exception {
-            doParsingTest("compiler/testData/psi/AttributesOnPatterns.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/AttributesOnPatterns.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Attributes_ERR.kt")
         public void testAttributes_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/Attributes_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Attributes_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BabySteps.kt")
         public void testBabySteps() throws Exception {
-            doParsingTest("compiler/testData/psi/BabySteps.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BabySteps.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BabySteps_ERR.kt")
         public void testBabySteps_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/BabySteps_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BabySteps_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BackslashInString.kt")
         public void testBackslashInString() throws Exception {
-            doParsingTest("compiler/testData/psi/BackslashInString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BackslashInString.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BlockCommentAtBeginningOfFile1.kt")
         public void testBlockCommentAtBeginningOfFile1() throws Exception {
-            doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile1.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BlockCommentAtBeginningOfFile2.kt")
         public void testBlockCommentAtBeginningOfFile2() throws Exception {
-            doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile2.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BlockCommentAtBeginningOfFile3.kt")
         public void testBlockCommentAtBeginningOfFile3() throws Exception {
-            doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile3.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("BlockCommentAtBeginningOfFile4.kt")
         public void testBlockCommentAtBeginningOfFile4() throws Exception {
-            doParsingTest("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/BlockCommentAtBeginningOfFile4.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ByClauses.kt")
         public void testByClauses() throws Exception {
-            doParsingTest("compiler/testData/psi/ByClauses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ByClauses.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("CallWithManyClosures.kt")
         public void testCallWithManyClosures() throws Exception {
-            doParsingTest("compiler/testData/psi/CallWithManyClosures.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/CallWithManyClosures.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("CallsInWhen.kt")
         public void testCallsInWhen() throws Exception {
-            doParsingTest("compiler/testData/psi/CallsInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/CallsInWhen.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Constructors.kt")
         public void testConstructors() throws Exception {
-            doParsingTest("compiler/testData/psi/Constructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Constructors.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ControlStructures.kt")
         public void testControlStructures() throws Exception {
-            doParsingTest("compiler/testData/psi/ControlStructures.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ControlStructures.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("DoubleColon.kt")
         public void testDoubleColon() throws Exception {
-            doParsingTest("compiler/testData/psi/DoubleColon.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/DoubleColon.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("EOLsInComments.kt")
         public void testEOLsInComments() throws Exception {
-            doParsingTest("compiler/testData/psi/EOLsInComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EOLsInComments.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("EOLsOnRollback.kt")
         public void testEOLsOnRollback() throws Exception {
-            doParsingTest("compiler/testData/psi/EOLsOnRollback.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EOLsOnRollback.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("EmptyFile.kt")
         public void testEmptyFile() throws Exception {
-            doParsingTest("compiler/testData/psi/EmptyFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/EmptyFile.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Enums.kt")
         public void testEnums() throws Exception {
-            doParsingTest("compiler/testData/psi/Enums.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Enums.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Expressions_ERR.kt")
         public void testExpressions_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/Expressions_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Expressions_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ExtensionsWithQNReceiver.kt")
         public void testExtensionsWithQNReceiver() throws Exception {
-            doParsingTest("compiler/testData/psi/ExtensionsWithQNReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ExtensionsWithQNReceiver.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FileStart_ERR.kt")
         public void testFileStart_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/FileStart_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FileStart_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FloatingPointLiteral.kt")
         public void testFloatingPointLiteral() throws Exception {
-            doParsingTest("compiler/testData/psi/FloatingPointLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FloatingPointLiteral.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ForWithMultiDecl.kt")
         public void testForWithMultiDecl() throws Exception {
-            doParsingTest("compiler/testData/psi/ForWithMultiDecl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ForWithMultiDecl.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionCalls.kt")
         public void testFunctionCalls() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionCalls.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionCalls.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionLiterals.kt")
         public void testFunctionLiterals() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionLiterals_ERR.kt")
         public void testFunctionLiterals_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionLiterals_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionLiterals_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionNoParameterList.kt")
         public void testFunctionNoParameterList() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionNoParameterList.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionNoParameterList.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionTypes.kt")
         public void testFunctionTypes() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("FunctionTypes_ERR.kt")
         public void testFunctionTypes_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/FunctionTypes_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/FunctionTypes_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Functions.kt")
         public void testFunctions() throws Exception {
-            doParsingTest("compiler/testData/psi/Functions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Functions.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Functions_ERR.kt")
         public void testFunctions_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/Functions_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Functions_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("HangOnLonelyModifier.kt")
         public void testHangOnLonelyModifier() throws Exception {
-            doParsingTest("compiler/testData/psi/HangOnLonelyModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/HangOnLonelyModifier.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("IfWithPropery.kt")
         public void testIfWithPropery() throws Exception {
-            doParsingTest("compiler/testData/psi/IfWithPropery.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/IfWithPropery.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ImportSoftKW.kt")
         public void testImportSoftKW() throws Exception {
-            doParsingTest("compiler/testData/psi/ImportSoftKW.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ImportSoftKW.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Imports.kt")
         public void testImports() throws Exception {
-            doParsingTest("compiler/testData/psi/Imports.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Imports.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Imports_ERR.kt")
         public void testImports_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/Imports_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Imports_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            doParsingTest("compiler/testData/psi/Inner.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Inner.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("IntegerLiteral.kt")
         public void testIntegerLiteral() throws Exception {
-            doParsingTest("compiler/testData/psi/IntegerLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/IntegerLiteral.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Labels.kt")
         public void testLabels() throws Exception {
-            doParsingTest("compiler/testData/psi/Labels.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Labels.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("LocalDeclarations.kt")
         public void testLocalDeclarations() throws Exception {
-            doParsingTest("compiler/testData/psi/LocalDeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LocalDeclarations.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("LongPackageName.kt")
         public void testLongPackageName() throws Exception {
-            doParsingTest("compiler/testData/psi/LongPackageName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/LongPackageName.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ModifierAsSelector.kt")
         public void testModifierAsSelector() throws Exception {
-            doParsingTest("compiler/testData/psi/ModifierAsSelector.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ModifierAsSelector.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("MultiVariableDeclarations.kt")
         public void testMultiVariableDeclarations() throws Exception {
-            doParsingTest("compiler/testData/psi/MultiVariableDeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/MultiVariableDeclarations.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("NestedComments.kt")
         public void testNestedComments() throws Exception {
-            doParsingTest("compiler/testData/psi/NestedComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NestedComments.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("NewLinesValidOperations.kt")
         public void testNewLinesValidOperations() throws Exception {
-            doParsingTest("compiler/testData/psi/NewLinesValidOperations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NewLinesValidOperations.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("NewlinesInParentheses.kt")
         public void testNewlinesInParentheses() throws Exception {
-            doParsingTest("compiler/testData/psi/NewlinesInParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NewlinesInParentheses.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("NotIsAndNotIn.kt")
         public void testNotIsAndNotIn() throws Exception {
-            doParsingTest("compiler/testData/psi/NotIsAndNotIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/NotIsAndNotIn.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ObjectLiteralAsStatement.kt")
         public void testObjectLiteralAsStatement() throws Exception {
-            doParsingTest("compiler/testData/psi/ObjectLiteralAsStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ObjectLiteralAsStatement.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("PackageBlockFirst.kt")
         public void testPackageBlockFirst() throws Exception {
-            doParsingTest("compiler/testData/psi/PackageBlockFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PackageBlockFirst.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("PackageModifiers.kt")
         public void testPackageModifiers() throws Exception {
-            doParsingTest("compiler/testData/psi/PackageModifiers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PackageModifiers.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ParameterNameMising.kt")
         public void testParameterNameMising() throws Exception {
-            doParsingTest("compiler/testData/psi/ParameterNameMising.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ParameterNameMising.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Precedence.kt")
         public void testPrecedence() throws Exception {
-            doParsingTest("compiler/testData/psi/Precedence.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Precedence.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("PrimaryConstructorModifiers_ERR.kt")
         public void testPrimaryConstructorModifiers_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PrimaryConstructorModifiers_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Properties.kt")
         public void testProperties() throws Exception {
-            doParsingTest("compiler/testData/psi/Properties.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Properties.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("PropertiesFollowedByInitializers.kt")
         public void testPropertiesFollowedByInitializers() throws Exception {
-            doParsingTest("compiler/testData/psi/PropertiesFollowedByInitializers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/PropertiesFollowedByInitializers.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Properties_ERR.kt")
         public void testProperties_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/Properties_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Properties_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("QuotedIdentifiers.kt")
         public void testQuotedIdentifiers() throws Exception {
-            doParsingTest("compiler/testData/psi/QuotedIdentifiers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/QuotedIdentifiers.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("RootPackage.kt")
         public void testRootPackage() throws Exception {
-            doParsingTest("compiler/testData/psi/RootPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/RootPackage.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SemicolonAfterIf.kt")
         public void testSemicolonAfterIf() throws Exception {
-            doParsingTest("compiler/testData/psi/SemicolonAfterIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SemicolonAfterIf.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ShortAnnotations.kt")
         public void testShortAnnotations() throws Exception {
-            doParsingTest("compiler/testData/psi/ShortAnnotations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ShortAnnotations.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SimpleClassMembers.kt")
         public void testSimpleClassMembers() throws Exception {
-            doParsingTest("compiler/testData/psi/SimpleClassMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SimpleClassMembers_ERR.kt")
         public void testSimpleClassMembers_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/SimpleClassMembers_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleClassMembers_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SimpleExpressions.kt")
         public void testSimpleExpressions() throws Exception {
-            doParsingTest("compiler/testData/psi/SimpleExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleExpressions.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SimpleModifiers.kt")
         public void testSimpleModifiers() throws Exception {
-            doParsingTest("compiler/testData/psi/SimpleModifiers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SimpleModifiers.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SoftKeywords.kt")
         public void testSoftKeywords() throws Exception {
-            doParsingTest("compiler/testData/psi/SoftKeywords.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywords.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("SoftKeywordsInTypeArguments.kt")
         public void testSoftKeywordsInTypeArguments() throws Exception {
-            doParsingTest("compiler/testData/psi/SoftKeywordsInTypeArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/SoftKeywordsInTypeArguments.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("StringTemplates.kt")
         public void testStringTemplates() throws Exception {
-            doParsingTest("compiler/testData/psi/StringTemplates.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/StringTemplates.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            doParsingTest("compiler/testData/psi/Super.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/Super.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("ThisType.kt")
         public void testThisType() throws Exception {
-            doParsingTest("compiler/testData/psi/ThisType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/ThisType.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TryRecovery.kt")
         public void testTryRecovery() throws Exception {
-            doParsingTest("compiler/testData/psi/TryRecovery.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TryRecovery.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeAnnotations.kt")
         public void testTypeAnnotations() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeAnnotations.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeAnnotations.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeConstraints.kt")
         public void testTypeConstraints() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeConstraints.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeConstraints.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeDef.kt")
         public void testTypeDef() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeDef.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeDef.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeDef_ERR.kt")
         public void testTypeDef_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeDef_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeDef_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeExpressionAmbiguities_ERR.kt")
         public void testTypeExpressionAmbiguities_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeExpressionAmbiguities_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("TypeParametersBeforeName.kt")
         public void testTypeParametersBeforeName() throws Exception {
-            doParsingTest("compiler/testData/psi/TypeParametersBeforeName.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/TypeParametersBeforeName.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("When.kt")
         public void testWhen() throws Exception {
-            doParsingTest("compiler/testData/psi/When.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/When.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("When_ERR.kt")
         public void testWhen_ERR() throws Exception {
-            doParsingTest("compiler/testData/psi/When_ERR.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/When_ERR.kt");
+            doParsingTest(fileName);
         }
         
         @TestMetadata("compiler/testData/psi/examples")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Examples.Array.class, Examples.Collections.class, Examples.Io.class, Examples.Map.class, Examples.Priorityqueues.class, Examples.Util.class})
         public static class Examples extends AbstractJetParsingTest {
             public void testAllFilesPresentInExamples() throws Exception {
@@ -465,80 +552,96 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("AnonymousObjects.kt")
             public void testAnonymousObjects() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/AnonymousObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/AnonymousObjects.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("BinaryTree.kt")
             public void testBinaryTree() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/BinaryTree.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/BinaryTree.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("BitArith.kt")
             public void testBitArith() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/BitArith.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/BitArith.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Builder.kt")
             public void testBuilder() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/Builder.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Builder.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Color.kt")
             public void testColor() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/Color.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Color.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("FunctionsAndTypes.kt")
             public void testFunctionsAndTypes() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/FunctionsAndTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/FunctionsAndTypes.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Graph.kt")
             public void testGraph() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/Graph.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Graph.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("IPushPop.kt")
             public void testIPushPop() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/IPushPop.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/IPushPop.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("LINQ.kt")
             public void testLINQ() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/LINQ.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/LINQ.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PolymorphicClassObjects.kt")
             public void testPolymorphicClassObjects() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/PolymorphicClassObjects.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/PolymorphicClassObjects.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Queue.kt")
             public void testQueue() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/Queue.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Queue.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Stack.kt")
             public void testStack() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/Stack.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/Stack.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("UnionFind.kt")
             public void testUnionFind() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/UnionFind.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/UnionFind.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("UpdateOperation.kt")
             public void testUpdateOperation() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/UpdateOperation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/UpdateOperation.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("With.kt")
             public void testWith() throws Exception {
-                doParsingTest("compiler/testData/psi/examples/With.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/With.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("compiler/testData/psi/examples/array")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Array extends AbstractJetParsingTest {
                 public void testAllFilesPresentInArray() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -546,12 +649,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("MutableArray.kt")
                 public void testMutableArray() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/array/MutableArray.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/array/MutableArray.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/psi/examples/collections")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Collections extends AbstractJetParsingTest {
                 public void testAllFilesPresentInCollections() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -559,67 +664,80 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("ArrayList.kt")
                 public void testArrayList() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/ArrayList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ArrayList.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("HashMap.kt")
                 public void testHashMap() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/HashMap.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/HashMap.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IIterable.kt")
                 public void testIIterable() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IIterable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterable.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IIterator.kt")
                 public void testIIterator() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IIterator.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IIterator.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IList.kt")
                 public void testIList() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IList.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IMutableIterable.kt")
                 public void testIMutableIterable() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IMutableIterable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterable.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IMutableIterator.kt")
                 public void testIMutableIterator() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IMutableIterator.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableIterator.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IMutableList.kt")
                 public void testIMutableList() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IMutableList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableList.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IMutableSet.kt")
                 public void testIMutableSet() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/IMutableSet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/IMutableSet.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("ISet.kt")
                 public void testISet() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/ISet.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISet.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("ISized.kt")
                 public void testISized() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/ISized.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/ISized.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("LinkedList.kt")
                 public void testLinkedList() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/collections/LinkedList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/collections/LinkedList.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/psi/examples/io")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Io extends AbstractJetParsingTest {
                 public void testAllFilesPresentInIo() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -627,12 +745,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("IOSamples.kt")
                 public void testIOSamples() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/io/IOSamples.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/io/IOSamples.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/psi/examples/map")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Map extends AbstractJetParsingTest {
                 public void testAllFilesPresentInMap() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -640,12 +760,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("IMap.kt")
                 public void testIMap() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/map/IMap.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/map/IMap.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/psi/examples/priorityqueues")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Priorityqueues extends AbstractJetParsingTest {
                 public void testAllFilesPresentInPriorityqueues() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -653,22 +775,26 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("BinaryHeap.kt")
                 public void testBinaryHeap() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/BinaryHeap.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IPriorityQueue.kt")
                 public void testIPriorityQueue() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/IPriorityQueue.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("PriorityQueueAsPushPop.kt")
                 public void testPriorityQueueAsPushPop() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/psi/examples/util")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Util extends AbstractJetParsingTest {
                 public void testAllFilesPresentInUtil() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -676,12 +802,14 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
                 
                 @TestMetadata("Comparison.kt")
                 public void testComparison() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/util/Comparison.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/util/Comparison.kt");
+                    doParsingTest(fileName);
                 }
                 
                 @TestMetadata("IComparable.kt")
                 public void testIComparable() throws Exception {
-                    doParsingTest("compiler/testData/psi/examples/util/IComparable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/examples/util/IComparable.kt");
+                    doParsingTest(fileName);
                 }
                 
             }
@@ -700,6 +828,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         }
         
         @TestMetadata("compiler/testData/psi/functionReceivers")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionReceivers extends AbstractJetParsingTest {
             public void testAllFilesPresentInFunctionReceivers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -707,22 +836,26 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("FunctionTypesWithFunctionReceivers.kt")
             public void testFunctionTypesWithFunctionReceivers() throws Exception {
-                doParsingTest("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionTypesWithFunctionReceivers.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("FunctionsWithFunctionReceivers.kt")
             public void testFunctionsWithFunctionReceivers() throws Exception {
-                doParsingTest("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/FunctionsWithFunctionReceivers.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PropertiesWithFunctionReceivers.kt")
             public void testPropertiesWithFunctionReceivers() throws Exception {
-                doParsingTest("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/functionReceivers/PropertiesWithFunctionReceivers.kt");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/greatSyntacticShift")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GreatSyntacticShift extends AbstractJetParsingTest {
             public void testAllFilesPresentInGreatSyntacticShift() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -730,22 +863,26 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("functionLiterals.kt")
             public void testFunctionLiterals() throws Exception {
-                doParsingTest("compiler/testData/psi/greatSyntacticShift/functionLiterals.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionLiterals.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("functionTypes.kt")
             public void testFunctionTypes() throws Exception {
-                doParsingTest("compiler/testData/psi/greatSyntacticShift/functionTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/functionTypes.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("FunctionTypesAsArguments.kt")
             public void testFunctionTypesAsArguments() throws Exception {
-                doParsingTest("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/greatSyntacticShift/FunctionTypesAsArguments.kt");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/kdoc")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Kdoc extends AbstractJetParsingTest {
             public void testAllFilesPresentInKdoc() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -753,62 +890,74 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("AtTags.kt")
             public void testAtTags() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/AtTags.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/AtTags.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DocCommentAtBeginningOfFile1.kt")
             public void testDocCommentAtBeginningOfFile1() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile1.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DocCommentAtBeginningOfFile2.kt")
             public void testDocCommentAtBeginningOfFile2() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile2.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DocCommentAtBeginningOfFile3.kt")
             public void testDocCommentAtBeginningOfFile3() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile3.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DocCommentAtBeginningOfFile4.kt")
             public void testDocCommentAtBeginningOfFile4() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/DocCommentAtBeginningOfFile4.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("EndOnLeadingAsterisks.kt")
             public void testEndOnLeadingAsterisks() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/EndOnLeadingAsterisks.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndOnLeadingAsterisks.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("EndRightAfterText.kt")
             public void testEndRightAfterText() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/EndRightAfterText.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/EndRightAfterText.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Incomplete.kt")
             public void testIncomplete() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/Incomplete.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Incomplete.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Markdown.kt")
             public void testMarkdown() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/Markdown.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Markdown.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Simple.kt")
             public void testSimple() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/Simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/Simple.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("TextRightAfterLeadAsterisks.kt")
             public void testTextRightAfterLeadAsterisks() throws Exception {
-                doParsingTest("compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/kdoc/TextRightAfterLeadAsterisks.kt");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/propertyDelegate")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PropertyDelegate extends AbstractJetParsingTest {
             public void testAllFilesPresentInPropertyDelegate() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/propertyDelegate"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -816,66 +965,79 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("BracketsInDelegate.kt")
             public void testBracketsInDelegate() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/BracketsInDelegate.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/BracketsInDelegate.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DelegateAndInitializer.kt")
             public void testDelegateAndInitializer() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/DelegateAndInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/DelegateAndInitializer.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("GetterInSameLine.kt")
             public void testGetterInSameLine() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/GetterInSameLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/GetterInSameLine.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("LocalProperty.kt")
             public void testLocalProperty() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/LocalProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/LocalProperty.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("OnlyBy.kt")
             public void testOnlyBy() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/OnlyBy.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/OnlyBy.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PropertyInClass.kt")
             public void testPropertyInClass() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/PropertyInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyInClass.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PropertyWithGetter.kt")
             public void testPropertyWithGetter() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithGetter.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PropertyWithInitializer.kt")
             public void testPropertyWithInitializer() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithInitializer.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PropertyWithoutTypeRef.kt")
             public void testPropertyWithoutTypeRef() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/PropertyWithoutTypeRef.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("TopLevelProperty.kt")
             public void testTopLevelProperty() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/TopLevelProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TopLevelProperty.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("TwoProperties.kt")
             public void testTwoProperties() throws Exception {
-                doParsingTest("compiler/testData/psi/propertyDelegate/TwoProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/propertyDelegate/TwoProperties.kt");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/recovery")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Recovery extends AbstractJetParsingTest {
             @TestMetadata("AbsentLeftHandSide.kt")
             public void testAbsentLeftHandSide() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/AbsentLeftHandSide.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/AbsentLeftHandSide.kt");
+                doParsingTest(fileName);
             }
             
             public void testAllFilesPresentInRecovery() throws Exception {
@@ -884,157 +1046,188 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("DoWhileWithEmptyCondition.kt")
             public void testDoWhileWithEmptyCondition() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/DoWhileWithEmptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithEmptyCondition.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("DoWhileWithoutLPar.kt")
             public void testDoWhileWithoutLPar() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/DoWhileWithoutLPar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/DoWhileWithoutLPar.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("EnumEntryInitList.kt")
             public void testEnumEntryInitList() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/EnumEntryInitList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/EnumEntryInitList.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForEmptyParentheses.kt")
             public void testForEmptyParentheses() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForEmptyParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyParentheses.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForEmptyWithoutBody.kt")
             public void testForEmptyWithoutBody() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForEmptyWithoutBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForEmptyWithoutBody.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForNoBodyBeforeRBrace.kt")
             public void testForNoBodyBeforeRBrace() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForNoBodyBeforeRBrace.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForRecovery.kt")
             public void testForRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithOnlyOneLParInEOF.kt")
             public void testForWithOnlyOneLParInEOF() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithOnlyOneLParInEOF.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithoutBodyInEOF.kt")
             public void testForWithoutBodyInEOF() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithoutBodyInEOF.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutBodyInEOF.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithoutLPar.kt")
             public void testForWithoutLPar() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithoutLPar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLPar.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithoutLParInEOF.kt")
             public void testForWithoutLParInEOF() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithoutLParInEOF.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutLParInEOF.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithoutParamButWithRange.kt")
             public void testForWithoutParamButWithRange() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithoutParamButWithRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutParamButWithRange.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ForWithoutRange.kt")
             public void testForWithoutRange() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ForWithoutRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ForWithoutRange.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("IfWithEmptyCondition.kt")
             public void testIfWithEmptyCondition() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/IfWithEmptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithEmptyCondition.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("IfWithoutLPar.kt")
             public void testIfWithoutLPar() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/IfWithoutLPar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/IfWithoutLPar.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ImportRecovery.kt")
             public void testImportRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ImportRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ImportRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("kt2172.kt")
             public void testKt2172() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/kt2172.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt2172.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("kt5102.kt")
             public void testKt5102() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/kt5102.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/kt5102.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("MissingCommaInConstructorValueParameterList.kt")
             public void testMissingCommaInConstructorValueParameterList() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInConstructorValueParameterList.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("MissingCommaInValueArgumentList.kt")
             public void testMissingCommaInValueArgumentList() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueArgumentList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueArgumentList.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("MissingCommaInValueParameterList.kt")
             public void testMissingCommaInValueParameterList() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterList.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("MissingCommaInValueParameterListWithValOrVar.kt")
             public void testMissingCommaInValueParameterListWithValOrVar() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/MissingCommaInValueParameterListWithValOrVar.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PackageNewLineRecovery.kt")
             public void testPackageNewLineRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/PackageNewLineRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageNewLineRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("PackageRecovery.kt")
             public void testPackageRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/PackageRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/PackageRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("SameLineStatementRecovery.kt")
             public void testSameLineStatementRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/SameLineStatementRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/SameLineStatementRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ValueParameterNoTypeRecovery.kt")
             public void testValueParameterNoTypeRecovery() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/ValueParameterNoTypeRecovery.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("WhenWithoutBraces.kt")
             public void testWhenWithoutBraces() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/WhenWithoutBraces.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhenWithoutBraces.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("WhileWithEmptyCondition.kt")
             public void testWhileWithEmptyCondition() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/WhileWithEmptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithEmptyCondition.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("WhileWithoutLPar.kt")
             public void testWhileWithoutLPar() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/WhileWithoutLPar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WhileWithoutLPar.kt");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("WithWithoutInAndMultideclaration.kt")
             public void testWithWithoutInAndMultideclaration() throws Exception {
-                doParsingTest("compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/recovery/WithWithoutInAndMultideclaration.kt");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/script")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Script extends AbstractJetParsingTest {
             public void testAllFilesPresentInScript() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/script"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -1042,37 +1235,44 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("ComplexScript.kts")
             public void testComplexScript() throws Exception {
-                doParsingTest("compiler/testData/psi/script/ComplexScript.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/ComplexScript.kts");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Import.kts")
             public void testImport() throws Exception {
-                doParsingTest("compiler/testData/psi/script/Import.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/Import.kts");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("Shebang.kts")
             public void testShebang() throws Exception {
-                doParsingTest("compiler/testData/psi/script/Shebang.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/Shebang.kts");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("ShebangIncorrect.kts")
             public void testShebangIncorrect() throws Exception {
-                doParsingTest("compiler/testData/psi/script/ShebangIncorrect.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/ShebangIncorrect.kts");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("SimpleScript.kts")
             public void testSimpleScript() throws Exception {
-                doParsingTest("compiler/testData/psi/script/SimpleScript.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/SimpleScript.kts");
+                doParsingTest(fileName);
             }
             
             @TestMetadata("unexpectedSymbol.kts")
             public void testUnexpectedSymbol() throws Exception {
-                doParsingTest("compiler/testData/psi/script/unexpectedSymbol.kts");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/script/unexpectedSymbol.kts");
+                doParsingTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/psi/stringTemplates")
+        @TestDataPath("$PROJECT_ROOT")
         public static class StringTemplates extends AbstractJetParsingTest {
             public void testAllFilesPresentInStringTemplates() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/stringTemplates"), Pattern.compile("^(.*)\\.kts?$"), true);
@@ -1080,7 +1280,8 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
             
             @TestMetadata("RawStringsWithManyQuotes.kt")
             public void testRawStringsWithManyQuotes() throws Exception {
-                doParsingTest("compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/psi/stringTemplates/RawStringsWithManyQuotes.kt");
+                doParsingTest(fileName);
             }
             
         }
@@ -1101,6 +1302,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
     }
     
     @TestMetadata("compiler/testData/parseCodeFragment/expression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expression extends AbstractJetParsingTest {
         public void testAllFilesPresentInExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/expression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1108,17 +1310,20 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         
         @TestMetadata("error.kt")
         public void testError() throws Exception {
-            doExpressionCodeFragmentParsingTest("compiler/testData/parseCodeFragment/expression/error.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/error.kt");
+            doExpressionCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doExpressionCodeFragmentParsingTest("compiler/testData/parseCodeFragment/expression/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/expression/simple.kt");
+            doExpressionCodeFragmentParsingTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/parseCodeFragment/block")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Block extends AbstractJetParsingTest {
         public void testAllFilesPresentInBlock() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/block"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1126,52 +1331,62 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {
         
         @TestMetadata("expressionOnTopLevel.kt")
         public void testExpressionOnTopLevel() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/expressionOnTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/expressionOnTopLevel.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/imports.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/imports.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("localFun.kt")
         public void testLocalFun() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/localFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/localFun.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("oneLine.kt")
         public void testOneLine() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/oneLine.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneLine.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("oneStatement.kt")
         public void testOneStatement() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/oneStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/oneStatement.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("packageAndImport.kt")
         public void testPackageAndImport() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/packageAndImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageAndImport.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("packageDirective.kt")
         public void testPackageDirective() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/packageDirective.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/packageDirective.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("severalExpressions.kt")
         public void testSeveralExpressions() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/severalExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalExpressions.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/severalStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/severalStatements.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
         @TestMetadata("unexpectedSymbol.kt")
         public void testUnexpectedSymbol() throws Exception {
-            doBlockCodeFragmentParsingTest("compiler/testData/parseCodeFragment/block/unexpectedSymbol.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/parseCodeFragment/block/unexpectedSymbol.kt");
+            doBlockCodeFragmentParsingTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java
index 25085bc261d..2f86a3fc5a3 100644
--- a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.repl;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/repl")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ReplInterpreterTestGenerated.Classes.class, ReplInterpreterTestGenerated.Multiline.class, ReplInterpreterTestGenerated.Objects.class, ReplInterpreterTestGenerated.PrimitiveTypes.class, ReplInterpreterTestGenerated.Reflection.class})
 public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
     public void testAllFilesPresentInRepl() throws Exception {
@@ -36,65 +38,78 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
     
     @TestMetadata("analyzeErrors.repl")
     public void testAnalyzeErrors() throws Exception {
-        doTest("compiler/testData/repl/analyzeErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/analyzeErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("constants.repl")
     public void testConstants() throws Exception {
-        doTest("compiler/testData/repl/constants.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/constants.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("empty.repl")
     public void testEmpty() throws Exception {
-        doTest("compiler/testData/repl/empty.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/empty.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("evaluationErrors.repl")
     public void testEvaluationErrors() throws Exception {
-        doTest("compiler/testData/repl/evaluationErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/evaluationErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("function.repl")
     public void testFunction() throws Exception {
-        doTest("compiler/testData/repl/function.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/function.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionOverloadResolution.repl")
     public void testFunctionOverloadResolution() throws Exception {
-        doTest("compiler/testData/repl/functionOverloadResolution.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolution.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionOverloadResolutionAnyBeatsString.repl")
     public void testFunctionOverloadResolutionAnyBeatsString() throws Exception {
-        doTest("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionOverloadResolutionAnyBeatsString.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("functionReferencesPrev.repl")
     public void testFunctionReferencesPrev() throws Exception {
-        doTest("compiler/testData/repl/functionReferencesPrev.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/functionReferencesPrev.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("imports.repl")
     public void testImports() throws Exception {
-        doTest("compiler/testData/repl/imports.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/imports.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("simple.repl")
     public void testSimple() throws Exception {
-        doTest("compiler/testData/repl/simple.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/simple.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("syntaxErrors.repl")
     public void testSyntaxErrors() throws Exception {
-        doTest("compiler/testData/repl/syntaxErrors.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/syntaxErrors.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("twoClosures.repl")
     public void testTwoClosures() throws Exception {
-        doTest("compiler/testData/repl/twoClosures.repl");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/twoClosures.repl");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/repl/classes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Classes extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/classes"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -102,52 +117,62 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("classInheritance.repl")
         public void testClassInheritance() throws Exception {
-            doTest("compiler/testData/repl/classes/classInheritance.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classInheritance.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("classRedeclaration.repl")
         public void testClassRedeclaration() throws Exception {
-            doTest("compiler/testData/repl/classes/classRedeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/classRedeclaration.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyClass.repl")
         public void testEmptyClass() throws Exception {
-            doTest("compiler/testData/repl/classes/emptyClass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyClassRedeclaration.repl")
         public void testEmptyClassRedeclaration() throws Exception {
-            doTest("compiler/testData/repl/classes/emptyClassRedeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/emptyClassRedeclaration.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("enumEntrySubclass.repl")
         public void testEnumEntrySubclass() throws Exception {
-            doTest("compiler/testData/repl/classes/enumEntrySubclass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/enumEntrySubclass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("import.repl")
         public void testImport() throws Exception {
-            doTest("compiler/testData/repl/classes/import.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/import.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleClass.repl")
         public void testSimpleClass() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleClass.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleClass.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleEnum.repl")
         public void testSimpleEnum() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleEnum.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleEnum.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleTrait.repl")
         public void testSimpleTrait() throws Exception {
-            doTest("compiler/testData/repl/classes/simpleTrait.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/classes/simpleTrait.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/multiline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Multiline extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInMultiline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/multiline"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -155,27 +180,32 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("functionOnSeveralLines.repl")
         public void testFunctionOnSeveralLines() throws Exception {
-            doTest("compiler/testData/repl/multiline/functionOnSeveralLines.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/functionOnSeveralLines.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineFunctionInvocation.repl")
         public void testMultilineFunctionInvocation() throws Exception {
-            doTest("compiler/testData/repl/multiline/multilineFunctionInvocation.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/multilineFunctionInvocation.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("openParenthesisIncomplete.repl")
         public void testOpenParenthesisIncomplete() throws Exception {
-            doTest("compiler/testData/repl/multiline/openParenthesisIncomplete.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/openParenthesisIncomplete.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleFunctionBodyOnNextLine.repl")
         public void testSimpleFunctionBodyOnNextLine() throws Exception {
-            doTest("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/multiline/simpleFunctionBodyOnNextLine.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/objects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Objects extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/objects"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -183,22 +213,26 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("emptyObject.repl")
         public void testEmptyObject() throws Exception {
-            doTest("compiler/testData/repl/objects/emptyObject.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/emptyObject.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("localObject.repl")
         public void testLocalObject() throws Exception {
-            doTest("compiler/testData/repl/objects/localObject.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/localObject.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleObjectDeclaration.repl")
         public void testSimpleObjectDeclaration() throws Exception {
-            doTest("compiler/testData/repl/objects/simpleObjectDeclaration.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/objects/simpleObjectDeclaration.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/primitiveTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PrimitiveTypes extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInPrimitiveTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/primitiveTypes"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -206,17 +240,20 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("arrayOfBoxed.repl")
         public void testArrayOfBoxed() throws Exception {
-            doTest("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/arrayOfBoxed.repl");
+            doTest(fileName);
         }
         
         @TestMetadata("boxingOnPurpose.repl")
         public void testBoxingOnPurpose() throws Exception {
-            doTest("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/primitiveTypes/boxingOnPurpose.repl");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/repl/reflection")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Reflection extends AbstractReplInterpreterTest {
         public void testAllFilesPresentInReflection() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/reflection"), Pattern.compile("^(.+)\\.repl$"), true);
@@ -224,7 +261,8 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
         
         @TestMetadata("propertyReference.repl")
         public void testPropertyReference() throws Exception {
-            doTest("compiler/testData/repl/reflection/propertyReference.repl");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/repl/reflection/propertyReference.repl");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java
index 78bb0218440..aa27e004861 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolve")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ResolveTestGenerated.CandidatesPriority.class, ResolveTestGenerated.DelegatedProperty.class, ResolveTestGenerated.Imports.class, ResolveTestGenerated.Labels.class, ResolveTestGenerated.Regressions.class, ResolveTestGenerated.Varargs.class})
 public class ResolveTestGenerated extends AbstractResolveTest {
     public void testAllFilesPresentInResolve() throws Exception {
@@ -36,145 +38,174 @@ public class ResolveTestGenerated extends AbstractResolveTest {
     
     @TestMetadata("Basic.resolve")
     public void testBasic() throws Exception {
-        doTest("compiler/testData/resolve/Basic.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Basic.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjects.resolve")
     public void testClassObjects() throws Exception {
-        doTest("compiler/testData/resolve/ClassObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ClassObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Classifiers.resolve")
     public void testClassifiers() throws Exception {
-        doTest("compiler/testData/resolve/Classifiers.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Classifiers.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("DefaultParamsOfLocalFunctions.resolve")
     public void testDefaultParamsOfLocalFunctions() throws Exception {
-        doTest("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/DefaultParamsOfLocalFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("DontImportRootScope.resolve")
     public void testDontImportRootScope() throws Exception {
-        doTest("compiler/testData/resolve/DontImportRootScope.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/DontImportRootScope.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ErrorSupertype.resolve")
     public void testErrorSupertype() throws Exception {
-        doTest("compiler/testData/resolve/ErrorSupertype.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ErrorSupertype.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionFunctions.resolve")
     public void testExtensionFunctions() throws Exception {
-        doTest("compiler/testData/resolve/ExtensionFunctions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ExtensionFunctions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionVariable.resolve")
     public void testFunctionVariable() throws Exception {
-        doTest("compiler/testData/resolve/FunctionVariable.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/FunctionVariable.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ImportingRootScopeWhenProcessingImports.resolve")
     public void testImportingRootScopeWhenProcessingImports() throws Exception {
-        doTest("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ImportingRootScopeWhenProcessingImports.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("kt304.resolve")
     public void testKt304() throws Exception {
-        doTest("compiler/testData/resolve/kt304.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/kt304.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalObjects.resolve")
     public void testLocalObjects() throws Exception {
-        doTest("compiler/testData/resolve/LocalObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/LocalObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObjects.resolve")
     public void testNestedObjects() throws Exception {
-        doTest("compiler/testData/resolve/NestedObjects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NestedObjects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("NoReferenceForErrorAnnotation.resolve")
     public void testNoReferenceForErrorAnnotation() throws Exception {
-        doTest("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/NoReferenceForErrorAnnotation.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Objects.resolve")
     public void testObjects() throws Exception {
-        doTest("compiler/testData/resolve/Objects.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Objects.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Packages.resolve")
     public void testPackages() throws Exception {
-        doTest("compiler/testData/resolve/Packages.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Packages.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PrimaryConstructorParameters.resolve")
     public void testPrimaryConstructorParameters() throws Exception {
-        doTest("compiler/testData/resolve/PrimaryConstructorParameters.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructorParameters.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PrimaryConstructors.resolve")
     public void testPrimaryConstructors() throws Exception {
-        doTest("compiler/testData/resolve/PrimaryConstructors.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PrimaryConstructors.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Projections.resolve")
     public void testProjections() throws Exception {
-        doTest("compiler/testData/resolve/Projections.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Projections.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyAndFunctionNameClash.resolve")
     public void testPropertyAndFunctionNameClash() throws Exception {
-        doTest("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/PropertyAndFunctionNameClash.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveOfInfixExpressions.resolve")
     public void testResolveOfInfixExpressions() throws Exception {
-        doTest("compiler/testData/resolve/ResolveOfInfixExpressions.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveOfInfixExpressions.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava.resolve")
     public void testResolveToJava() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava2.resolve")
     public void testResolveToJava2() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava2.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava2.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJava3.resolve")
     public void testResolveToJava3() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJava3.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJava3.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveToJavaTypeTransform.resolve")
     public void testResolveToJavaTypeTransform() throws Exception {
-        doTest("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ResolveToJavaTypeTransform.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("ScopeInteraction.resolve")
     public void testScopeInteraction() throws Exception {
-        doTest("compiler/testData/resolve/ScopeInteraction.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/ScopeInteraction.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("StringTemplates.resolve")
     public void testStringTemplates() throws Exception {
-        doTest("compiler/testData/resolve/StringTemplates.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/StringTemplates.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("Super.resolve")
     public void testSuper() throws Exception {
-        doTest("compiler/testData/resolve/Super.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/Super.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("TryCatch.resolve")
     public void testTryCatch() throws Exception {
-        doTest("compiler/testData/resolve/TryCatch.resolve");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/TryCatch.resolve");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolve/candidatesPriority")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CandidatesPriority extends AbstractResolveTest {
         public void testAllFilesPresentInCandidatesPriority() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/candidatesPriority"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -182,92 +213,110 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("classObjectOuterResolve.resolve")
         public void testClassObjectOuterResolve() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/classObjectOuterResolve.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver1.resolve")
         public void testCloserReceiver1() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver1.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver2.resolve")
         public void testCloserReceiver2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerReceiver3.resolve")
         public void testCloserReceiver3() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerReceiver3.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("closerScope.resolve")
         public void testCloserScope() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/closerScope.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/closerScope.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionToCloserReceiverVsMember.resolve")
         public void testExtensionToCloserReceiverVsMember() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/extensionToCloserReceiverVsMember.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitThisVsNoReceiver.resolve")
         public void testImplicitThisVsNoReceiver() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitThisVsNoReceiver2.resolve")
         public void testImplicitThisVsNoReceiver2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/implicitThisVsNoReceiver2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("localVsImplicitThis.resolve")
         public void testLocalVsImplicitThis() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/localVsImplicitThis.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension1.resolve")
         public void testMemberVsExtension1() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension1.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension2.resolve")
         public void testMemberVsExtension2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsExtension3.resolve")
         public void testMemberVsExtension3() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsExtension3.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberVsLocalExtension.resolve")
         public void testMemberVsLocalExtension() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberVsLocalExtension.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("memberWithInvokeVsNonLocal.resolve")
         public void testMemberWithInvokeVsNonLocal() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/memberWithInvokeVsNonLocal.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverVsThisObject.resolve")
         public void testReceiverVsThisObject() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/receiverVsThisObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverVsThisObject2.resolve")
         public void testReceiverVsThisObject2() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/receiverVsThisObject2.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/receiverVsThisObject2.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("wrongReceiverVsOtherError.resolve")
         public void testWrongReceiverVsOtherError() throws Exception {
-            doTest("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/candidatesPriority/wrongReceiverVsOtherError.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/delegatedProperty")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DelegatedProperty extends AbstractResolveTest {
         public void testAllFilesPresentInDelegatedProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/delegatedProperty"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -275,42 +324,50 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("delegationByCall.resolve")
         public void testDelegationByCall() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByCall.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByConstructor.resolve")
         public void testDelegationByConstructor() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByConstructor.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByFun.resolve")
         public void testDelegationByFun() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByFun.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByObject.resolve")
         public void testDelegationByObject() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationByProperty.resolve")
         public void testDelegationByProperty() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationByProperty.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationInClass.resolve")
         public void testDelegationInClass() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/delegationInClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("localDelegation.resolve")
         public void testLocalDelegation() throws Exception {
-            doTest("compiler/testData/resolve/delegatedProperty/localDelegation.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/delegatedProperty/localDelegation.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Imports extends AbstractResolveTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -318,67 +375,80 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("ImportConflictAllPackage.resolve")
         public void testImportConflictAllPackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictAllPackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictBetweenImportedAndRootPackage.resolve")
         public void testImportConflictBetweenImportedAndRootPackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndRootPackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictBetweenImportedAndSamePackage.resolve")
         public void testImportConflictBetweenImportedAndSamePackage() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictBetweenImportedAndSamePackage.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictForFunctions.resolve")
         public void testImportConflictForFunctions() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictForFunctions.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictPackageAndClass.resolve")
         public void testImportConflictPackageAndClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictPackageAndClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictSameNameClass.resolve")
         public void testImportConflictSameNameClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictSameNameClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithClassObject.resolve")
         public void testImportConflictWithClassObject() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithClassObject.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithInFileClass.resolve")
         public void testImportConflictWithInFileClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInFileClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictWithInnerClass.resolve")
         public void testImportConflictWithInnerClass() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictWithInnerClass.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportConflictsWithMappedToJava.resolve")
         public void testImportConflictsWithMappedToJava() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportConflictsWithMappedToJava.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportNonBlockingAnalysis.resolve")
         public void testImportNonBlockingAnalysis() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportNonBlockingAnalysis.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("ImportResolveOrderStable.resolve")
         public void testImportResolveOrderStable() throws Exception {
-            doTest("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/imports/ImportResolveOrderStable.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/labels")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Labels extends AbstractResolveTest {
         public void testAllFilesPresentInLabels() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/labels"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -386,17 +456,20 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("labelForPropertyInGetter.resolve")
         public void testLabelForPropertyInGetter() throws Exception {
-            doTest("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInGetter.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("labelForPropertyInSetter.resolve")
         public void testLabelForPropertyInSetter() throws Exception {
-            doTest("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/labels/labelForPropertyInSetter.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/regressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Regressions extends AbstractResolveTest {
         public void testAllFilesPresentInRegressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/regressions"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -404,12 +477,14 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("kt300.resolve")
         public void testKt300() throws Exception {
-            doTest("compiler/testData/resolve/regressions/kt300.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/regressions/kt300.resolve");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolve/varargs")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Varargs extends AbstractResolveTest {
         public void testAllFilesPresentInVarargs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/varargs"), Pattern.compile("^(.+)\\.resolve$"), true);
@@ -417,17 +492,20 @@ public class ResolveTestGenerated extends AbstractResolveTest {
         
         @TestMetadata("MoreSpecificVarargsOfEqualLength.resolve")
         public void testMoreSpecificVarargsOfEqualLength() throws Exception {
-            doTest("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/MoreSpecificVarargsOfEqualLength.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("NilaryVsVararg.resolve")
         public void testNilaryVsVararg() throws Exception {
-            doTest("compiler/testData/resolve/varargs/NilaryVsVararg.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/NilaryVsVararg.resolve");
+            doTest(fileName);
         }
         
         @TestMetadata("UnaryVsVararg.resolve")
         public void testUnaryVsVararg() throws Exception {
-            doTest("compiler/testData/resolve/varargs/UnaryVsVararg.resolve");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolve/varargs/UnaryVsVararg.resolve");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java
index 2cb1874c4b0..77db7962f19 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.annotation;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolveAnnotations/parameters")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({AnnotationParameterTestGenerated.Expressions.class})
 public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest {
     public void testAllFilesPresentInParameters() throws Exception {
@@ -36,40 +38,48 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete
     
     @TestMetadata("byte.kt")
     public void testByte() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/byte.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/byte.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("char.kt")
     public void testChar() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/char.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/char.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("double.kt")
     public void testDouble() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/double.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/double.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("float.kt")
     public void testFloat() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/float.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/float.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("int.kt")
     public void testInt() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/int.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/int.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("long.kt")
     public void testLong() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/long.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/long.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("short.kt")
     public void testShort() throws Exception {
-        doTest("compiler/testData/resolveAnnotations/parameters/short.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/short.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolveAnnotations/parameters/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractAnnotationParameterTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -77,177 +87,212 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete
         
         @TestMetadata("andAnd.kt")
         public void testAndAnd() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/andAnd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("boolean.kt")
         public void testBoolean() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/boolean.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("char.kt")
         public void testChar() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/char.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/char.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compositeCallBinary.kt")
         public void testCompositeCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/compositeCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("divide.kt")
         public void testDivide() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/divide.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("double.kt")
         public void testDouble() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/double.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/double.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("eqeq.kt")
         public void testEqeq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/eqeq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("escapedString.kt")
         public void testEscapedString() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/escapedString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("float.kt")
         public void testFloat() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/float.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/float.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("gt.kt")
         public void testGt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("gteq.kt")
         public void testGteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/gteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCallBinary.kt")
         public void testInfixCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/infixCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("intrincics.kt")
         public void testIntrincics() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/intrincics.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeled.kt")
         public void testLabeled() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/labeled.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("long.kt")
         public void testLong() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/long.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/long.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lt.kt")
         public void testLt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lteq.kt")
         public void testLteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/lteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValue.kt")
         public void testMaxValue() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValueByte.kt")
         public void testMaxValueByte() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueByte.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("maxValueInt.kt")
         public void testMaxValueInt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/maxValueInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("miltiply.kt")
         public void testMiltiply() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/miltiply.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("minus.kt")
         public void testMinus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/minus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("mod.kt")
         public void testMod() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/mod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineString.kt")
         public void testMultilineString() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/multilineString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("not.kt")
         public void testNot() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/not.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/not.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noteq.kt")
         public void testNoteq() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/noteq.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("orOr.kt")
         public void testOrOr() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/orOr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("paranthesized.kt")
         public void testParanthesized() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/paranthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plus.kt")
         public void testPlus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/plus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleCallBinary.kt")
         public void testSimpleCallBinary() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/simpleCallBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringPlusInt.kt")
         public void testStringPlusInt() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringPlusInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringTemplate.kt")
         public void testStringTemplate() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/stringTemplate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("strings.kt")
         public void testStrings() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/strings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unaryMinus.kt")
         public void testUnaryMinus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryMinus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unaryPlus.kt")
         public void testUnaryPlus() throws Exception {
-            doTest("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolveAnnotations/parameters/expressions/unaryPlus.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java
index 27f47647607..f3673abfa34 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.calls;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/resolvedCalls")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ResolvedCallsTestGenerated.Arguments.class, ResolvedCallsTestGenerated.DifferentCallElements.class, ResolvedCallsTestGenerated.FunctionTypes.class, ResolvedCallsTestGenerated.Invoke.class, ResolvedCallsTestGenerated.ObjectsAndClassObjects.class, ResolvedCallsTestGenerated.RealExamples.class, ResolvedCallsTestGenerated.Resolve.class, ResolvedCallsTestGenerated.ThisOrSuper.class})
 public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     public void testAllFilesPresentInResolvedCalls() throws Exception {
@@ -36,45 +38,54 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     
     @TestMetadata("explicitReceiverIsReceiverArgument.kt")
     public void testExplicitReceiverIsReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("explicitReceiverIsThisObject.kt")
     public void testExplicitReceiverIsThisObject() throws Exception {
-        doTest("compiler/testData/resolvedCalls/explicitReceiverIsThisObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/explicitReceiverIsThisObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("hasBothThisObjectAndReceiverArgument.kt")
     public void testHasBothThisObjectAndReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt")
     public void testHasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver() throws Exception {
-        doTest("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/hasBothThisObjectAndReceiverArgumentWithoutExplicitReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("implicitReceiverIsReceiverArgument.kt")
     public void testImplicitReceiverIsReceiverArgument() throws Exception {
-        doTest("compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsReceiverArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("implicitReceiverIsThisObject.kt")
     public void testImplicitReceiverIsThisObject() throws Exception {
-        doTest("compiler/testData/resolvedCalls/implicitReceiverIsThisObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/implicitReceiverIsThisObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("impliedThisNoExplicitReceiver.kt")
     public void testImpliedThisNoExplicitReceiver() throws Exception {
-        doTest("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/impliedThisNoExplicitReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleCall.kt")
     public void testSimpleCall() throws Exception {
-        doTest("compiler/testData/resolvedCalls/simpleCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/simpleCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/arguments")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Arguments.FunctionLiterals.class, Arguments.GenericCalls.class, Arguments.NamedArguments.class, Arguments.OneArgument.class, Arguments.RealExamples.class, Arguments.SeveralCandidates.class})
     public static class Arguments extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInArguments() throws Exception {
@@ -82,6 +93,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionLiterals extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInFunctionLiterals() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -89,37 +101,44 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("chainedLambdas.kt")
             public void testChainedLambdas() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/chainedLambdas.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notInferredLambdaReturnType.kt")
             public void testNotInferredLambdaReturnType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notInferredLambdaType.kt")
             public void testNotInferredLambdaType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/notInferredLambdaType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleGenericLambda.kt")
             public void testSimpleGenericLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleGenericLambda.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleLambda.kt")
             public void testSimpleLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/simpleLambda.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedLambda.kt")
             public void testUnmappedLambda() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals/unmappedLambda.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/genericCalls")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GenericCalls extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInGenericCalls() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/genericCalls"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -127,27 +146,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("inferredParameter.kt")
             public void testInferredParameter() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/inferredParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleGeneric.kt")
             public void testSimpleGeneric() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/simpleGeneric.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninferredParameter.kt")
             public void testUninferredParameter() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("uninferredParameterTypeMismatch.kt")
             public void testUninferredParameterTypeMismatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/genericCalls/uninferredParameterTypeMismatch.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/namedArguments")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NamedArguments extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInNamedArguments() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -155,17 +179,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("positionedAfterNamed.kt")
             public void testPositionedAfterNamed() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/positionedAfterNamed.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("shiftedArgsMatch.kt")
             public void testShiftedArgsMatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/namedArguments/shiftedArgsMatch.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/oneArgument")
+        @TestDataPath("$PROJECT_ROOT")
         public static class OneArgument extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInOneArgument() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/oneArgument"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -173,27 +200,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("argumentHasNoType.kt")
             public void testArgumentHasNoType() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/argumentHasNoType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleMatch.kt")
             public void testSimpleMatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/simpleMatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeMismatch.kt")
             public void testTypeMismatch() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/typeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unmappedArgument.kt")
             public void testUnmappedArgument() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/oneArgument/unmappedArgument.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/realExamples")
+        @TestDataPath("$PROJECT_ROOT")
         public static class RealExamples extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInRealExamples() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/realExamples"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -201,17 +233,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("emptyList.kt")
             public void testEmptyList() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyMutableList.kt")
             public void testEmptyMutableList() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/realExamples/emptyMutableList.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SeveralCandidates extends AbstractResolvedCallsTest {
             public void testAllFilesPresentInSeveralCandidates() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/severalCandidates"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -219,7 +254,8 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
             
             @TestMetadata("mostSpecific.kt")
             public void testMostSpecific() throws Exception {
-                doTest("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates/mostSpecific.kt");
+                doTest(fileName);
             }
             
         }
@@ -238,6 +274,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/differentCallElements")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DifferentCallElements extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInDifferentCallElements() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/differentCallElements"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -245,22 +282,26 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("annotationCall.kt")
         public void testAnnotationCall() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/annotationCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegatorToSuperCall.kt")
         public void testDelegatorToSuperCall() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/delegatorToSuperCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleArrayAccess.kt")
         public void testSimpleArrayAccess() throws Exception {
-            doTest("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/differentCallElements/simpleArrayAccess.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/functionTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FunctionTypes extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInFunctionTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/functionTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -268,37 +309,44 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("invokeForExtensionFunctionType.kt")
         public void testInvokeForExtensionFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeForFunctionType.kt")
         public void testInvokeForFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfExtensionFunctionType.kt")
         public void testValOfExtensionFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfExtensionFunctionTypeInvoke.kt")
         public void testValOfExtensionFunctionTypeInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfFunctionType.kt")
         public void testValOfFunctionType() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valOfFunctionTypeInvoke.kt")
         public void testValOfFunctionTypeInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/functionTypes/valOfFunctionTypeInvoke.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/invoke")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Invoke extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/invoke"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -306,57 +354,68 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("bothReceivers.kt")
         public void testBothReceivers() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/bothReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/bothReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitReceiverForInvoke.kt")
         public void testImplicitReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObject1.kt")
         public void testInvokeOnClassObject1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnClassObject2.kt")
         public void testInvokeOnClassObject2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnClassObject2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnumEntry1.kt")
         public void testInvokeOnEnumEntry1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnEnumEntry2.kt")
         public void testInvokeOnEnumEntry2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnEnumEntry2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject1.kt")
         public void testInvokeOnObject1() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invokeOnObject2.kt")
         public void testInvokeOnObject2() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/invokeOnObject2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("receiverArgumentAsReceiverForInvoke.kt")
         public void testReceiverArgumentAsReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/receiverArgumentAsReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisObjectAsReceiverForInvoke.kt")
         public void testThisObjectAsReceiverForInvoke() throws Exception {
-            doTest("compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/invoke/thisObjectAsReceiverForInvoke.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ObjectsAndClassObjects extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInObjectsAndClassObjects() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/objectsAndClassObjects"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -364,22 +423,26 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("classObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt5308IntRangeConstant.kt")
         public void testKt5308IntRangeConstant() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/kt5308IntRangeConstant.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            doTest("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/realExamples")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RealExamples extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInRealExamples() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/realExamples"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -387,12 +450,14 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("stringPlusInBuilders.kt")
         public void testStringPlusInBuilders() throws Exception {
-            doTest("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/resolve")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Resolve extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInResolve() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/resolve"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -400,17 +465,20 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("mostSpecificUninferredParam.kt")
         public void testMostSpecificUninferredParam() throws Exception {
-            doTest("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificUninferredParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("mostSpecificWithLambda.kt")
         public void testMostSpecificWithLambda() throws Exception {
-            doTest("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/resolvedCalls/thisOrSuper")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ThisOrSuper extends AbstractResolvedCallsTest {
         public void testAllFilesPresentInThisOrSuper() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/thisOrSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -418,27 +486,32 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
         
         @TestMetadata("labeledSuper.kt")
         public void testLabeledSuper() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeledThis.kt")
         public void testLabeledThis() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/labeledThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleSuper.kt")
         public void testSimpleSuper() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleThis.kt")
         public void testSimpleThis() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/simpleThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("thisInExtensionFunction.kt")
         public void testThisInExtensionFunction() throws Exception {
-            doTest("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/resolvedCalls/thisOrSuper/thisInExtensionFunction.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java
index 4c00b9147a8..cb3bd8a72c2 100644
--- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve.constraintSystem;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/constraintSystem")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ConstraintSystemTestGenerated.CheckStatus.class, ConstraintSystemTestGenerated.ComputeValues.class, ConstraintSystemTestGenerated.IntegerValueTypes.class, ConstraintSystemTestGenerated.SeveralVariables.class, ConstraintSystemTestGenerated.Variance.class})
 public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest {
     public void testAllFilesPresentInConstraintSystem() throws Exception {
@@ -35,6 +37,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
     }
     
     @TestMetadata("compiler/testData/constraintSystem/checkStatus")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CheckStatus extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInCheckStatus() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -42,32 +45,38 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("conflictingConstraints.bounds")
         public void testConflictingConstraints() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/conflictingConstraints.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("successful.bounds")
         public void testSuccessful() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/successful.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/successful.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("typeConstructorMismatch.bounds")
         public void testTypeConstructorMismatch() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/typeConstructorMismatch.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("unknownParameters.bounds")
         public void testUnknownParameters() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/unknownParameters.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("violatedUpperBound.bounds")
         public void testViolatedUpperBound() throws Exception {
-            doTest("compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/checkStatus/violatedUpperBound.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/computeValues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ComputeValues extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInComputeValues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -75,27 +84,32 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("contradiction.bounds")
         public void testContradiction() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/contradiction.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/contradiction.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("subTypeOfUpperBounds.bounds")
         public void testSubTypeOfUpperBounds() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/subTypeOfUpperBounds.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("superTypeOfLowerBounds1.bounds")
         public void testSuperTypeOfLowerBounds1() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds1.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("superTypeOfLowerBounds2.bounds")
         public void testSuperTypeOfLowerBounds2() throws Exception {
-            doTest("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/computeValues/superTypeOfLowerBounds2.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/integerValueTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IntegerValueTypes extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInIntegerValueTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -103,47 +117,56 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("byteOverflow.bounds")
         public void testByteOverflow() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/byteOverflow.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultLong.bounds")
         public void testDefaultLong() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/defaultLong.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("numberAndAny.bounds")
         public void testNumberAndAny() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndAny.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("numberAndString.bounds")
         public void testNumberAndString() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/numberAndString.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("severalNumbers.bounds")
         public void testSeveralNumbers() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/severalNumbers.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleByte.bounds")
         public void testSimpleByte() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleByte.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInt.bounds")
         public void testSimpleInt() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleInt.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleShort.bounds")
         public void testSimpleShort() throws Exception {
-            doTest("compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/integerValueTypes/simpleShort.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/severalVariables")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SeveralVariables extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInSeveralVariables() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -151,12 +174,14 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("simpleDependency.bounds")
         public void testSimpleDependency() throws Exception {
-            doTest("compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/severalVariables/simpleDependency.bounds");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/constraintSystem/variance")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Variance extends AbstractConstraintSystemTest {
         public void testAllFilesPresentInVariance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.bounds$"), true);
@@ -164,17 +189,20 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest
         
         @TestMetadata("consumer.bounds")
         public void testConsumer() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/consumer.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/consumer.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("invariant.bounds")
         public void testInvariant() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/invariant.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/invariant.bounds");
+            doTest(fileName);
         }
         
         @TestMetadata("producer.bounds")
         public void testProducer() throws Exception {
-            doTest("compiler/testData/constraintSystem/variance/producer.bounds");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/constraintSystem/variance/producer.bounds");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java
index dfbb43aa21e..424d76320f7 100644
--- a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.checkers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/checker/js")
+@TestDataPath("$PROJECT_ROOT")
 public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest {
     public void testAllFilesPresentInJs() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,12 +37,14 @@ public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest {
     
     @TestMetadata("basic.kt")
     public void testBasic() throws Exception {
-        doTest("idea/testData/checker/js/basic.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/basic.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("helloWorld.kt")
     public void testHelloWorld() throws Exception {
-        doTest("idea/testData/checker/js/helloWorld.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/js/helloWorld.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
index 60e86eeca96..c1df81681df 100644
--- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.checkers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,10 +31,12 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Recovery.class, JetPsiCheckerTestGenerated.Rendering.class, JetPsiCheckerTestGenerated.DuplicateJvmSignature.class, JetPsiCheckerTestGenerated.Infos.class})
 public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     @TestMetadata("idea/testData/checker")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Checker extends AbstractJetPsiCheckerTest {
         @TestMetadata("Abstract.kt")
         public void testAbstract() throws Exception {
-            doTest("idea/testData/checker/Abstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Abstract.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInChecker() throws Exception {
@@ -42,252 +45,302 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("AnonymousInitializers.kt")
         public void testAnonymousInitializers() throws Exception {
-            doTest("idea/testData/checker/AnonymousInitializers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/AnonymousInitializers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryCallsOnNullableValues.kt")
         public void testBinaryCallsOnNullableValues() throws Exception {
-            doTest("idea/testData/checker/BinaryCallsOnNullableValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BinaryCallsOnNullableValues.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Bounds.kt")
         public void testBounds() throws Exception {
-            doTest("idea/testData/checker/Bounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Bounds2.kt")
         public void testBounds2() throws Exception {
-            doTest("idea/testData/checker/Bounds2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Bounds2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BoundsWithSubstitutors.kt")
         public void testBoundsWithSubstitutors() throws Exception {
-            doTest("idea/testData/checker/BoundsWithSubstitutors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BoundsWithSubstitutors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BreakContinue.kt")
         public void testBreakContinue() throws Exception {
-            doTest("idea/testData/checker/BreakContinue.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/BreakContinue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Builders.kt")
         public void testBuilders() throws Exception {
-            doTest("idea/testData/checker/Builders.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Builders.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Casts.kt")
         public void testCasts() throws Exception {
-            doTest("idea/testData/checker/Casts.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Casts.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjects.kt")
         public void testClassObjects() throws Exception {
-            doTest("idea/testData/checker/ClassObjects.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ClassObjects.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constants.kt")
         public void testConstants() throws Exception {
-            doTest("idea/testData/checker/Constants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constructors.kt")
         public void testConstructors() throws Exception {
-            doTest("idea/testData/checker/Constructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Constructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CyclicHierarchy.kt")
         public void testCyclicHierarchy() throws Exception {
-            doTest("idea/testData/checker/CyclicHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/CyclicHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunctions.kt")
         public void testExtensionFunctions() throws Exception {
-            doTest("idea/testData/checker/ExtensionFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ExtensionFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ForRangeConventions.kt")
         public void testForRangeConventions() throws Exception {
-            doTest("idea/testData/checker/ForRangeConventions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ForRangeConventions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionReturnTypes.kt")
         public void testFunctionReturnTypes() throws Exception {
-            doTest("idea/testData/checker/FunctionReturnTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/FunctionReturnTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericArgumentConsistency.kt")
         public void testGenericArgumentConsistency() throws Exception {
-            doTest("idea/testData/checker/GenericArgumentConsistency.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/GenericArgumentConsistency.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IncDec.kt")
         public void testIncDec() throws Exception {
-            doTest("idea/testData/checker/IncDec.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IncDec.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IsExpressions.kt")
         public void testIsExpressions() throws Exception {
-            doTest("idea/testData/checker/IsExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/IsExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LocalObjects.kt")
         public void testLocalObjects() throws Exception {
-            doTest("idea/testData/checker/LocalObjects.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/LocalObjects.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MultipleBounds.kt")
         public void testMultipleBounds() throws Exception {
-            doTest("idea/testData/checker/MultipleBounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/MultipleBounds.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedObjects.kt")
         public void testNestedObjects() throws Exception {
-            doTest("idea/testData/checker/NestedObjects.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NestedObjects.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NotFinishedGenericDeclaration.kt")
         public void testNotFinishedGenericDeclaration() throws Exception {
-            doTest("idea/testData/checker/NotFinishedGenericDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/NotFinishedGenericDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Nullability.kt")
         public void testNullability() throws Exception {
-            doTest("idea/testData/checker/Nullability.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Nullability.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Objects.kt")
         public void testObjects() throws Exception {
-            doTest("idea/testData/checker/Objects.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Objects.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Override.kt")
         public void testOverride() throws Exception {
-            doTest("idea/testData/checker/Override.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Override.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverridesAndGenerics.kt")
         public void testOverridesAndGenerics() throws Exception {
-            doTest("idea/testData/checker/OverridesAndGenerics.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/OverridesAndGenerics.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PackageAsExpression.kt")
         public void testPackageAsExpression() throws Exception {
-            doTest("idea/testData/checker/PackageAsExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageAsExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PackageQualified.kt")
         public void testPackageQualified() throws Exception {
-            doTest("idea/testData/checker/PackageQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PackageQualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrimaryConstructors.kt")
         public void testPrimaryConstructors() throws Exception {
-            doTest("idea/testData/checker/PrimaryConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/PrimaryConstructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ProjectionsInSupertypes.kt")
         public void testProjectionsInSupertypes() throws Exception {
-            doTest("idea/testData/checker/ProjectionsInSupertypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ProjectionsInSupertypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Properties.kt")
         public void testProperties() throws Exception {
-            doTest("idea/testData/checker/Properties.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Properties.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedExpressions.kt")
         public void testQualifiedExpressions() throws Exception {
-            doTest("idea/testData/checker/QualifiedExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedThis.kt")
         public void testQualifiedThis() throws Exception {
-            doTest("idea/testData/checker/QualifiedThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedThisInClosures.kt")
         public void testQualifiedThisInClosures() throws Exception {
-            doTest("idea/testData/checker/QualifiedThisInClosures.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/QualifiedThisInClosures.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RecursiveTypeInference.kt")
         public void testRecursiveTypeInference() throws Exception {
-            doTest("idea/testData/checker/RecursiveTypeInference.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/RecursiveTypeInference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Redeclaration.kt")
         public void testRedeclaration() throws Exception {
-            doTest("idea/testData/checker/Redeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Redeclarations.kt")
         public void testRedeclarations() throws Exception {
-            doTest("idea/testData/checker/Redeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Redeclarations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ResolveToJava.kt")
         public void testResolveToJava() throws Exception {
-            doTest("idea/testData/checker/ResolveToJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/ResolveToJava.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Shadowing.kt")
         public void testShadowing() throws Exception {
-            doTest("idea/testData/checker/Shadowing.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Shadowing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringTemplates.kt")
         public void testStringTemplates() throws Exception {
-            doTest("idea/testData/checker/StringTemplates.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/StringTemplates.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SupertypeListChecks.kt")
         public void testSupertypeListChecks() throws Exception {
-            doTest("idea/testData/checker/SupertypeListChecks.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/SupertypeListChecks.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitSupertypeList.kt")
         public void testTraitSupertypeList() throws Exception {
-            doTest("idea/testData/checker/TraitSupertypeList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/TraitSupertypeList.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("trivialHierarchyLoop.kt")
         public void testTrivialHierarchyLoop() throws Exception {
-            doTest("idea/testData/checker/trivialHierarchyLoop.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/trivialHierarchyLoop.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unmetTraitRequirements.kt")
         public void testUnmetTraitRequirements() throws Exception {
-            doTest("idea/testData/checker/unmetTraitRequirements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/unmetTraitRequirements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnreachableCode.kt")
         public void testUnreachableCode() throws Exception {
-            doTest("idea/testData/checker/UnreachableCode.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/UnreachableCode.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Unresolved.kt")
         public void testUnresolved() throws Exception {
-            doTest("idea/testData/checker/Unresolved.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Unresolved.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Variance.kt")
         public void testVariance() throws Exception {
-            doTest("idea/testData/checker/Variance.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/Variance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("When.kt")
         public void testWhen() throws Exception {
-            doTest("idea/testData/checker/When.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/When.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhenInEnumInExtensionProperty.kt")
         public void testWhenInEnumInExtensionProperty() throws Exception {
-            doTest("idea/testData/checker/WhenInEnumInExtensionProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/WhenInEnumInExtensionProperty.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/checker/regression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Regression extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRegression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -295,127 +348,152 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("AmbiguityOnLazyTypeComputation.kt")
         public void testAmbiguityOnLazyTypeComputation() throws Exception {
-            doTest("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AssignmentsUnderOperators.kt")
         public void testAssignmentsUnderOperators() throws Exception {
-            doTest("idea/testData/checker/regression/AssignmentsUnderOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/AssignmentsUnderOperators.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CoercionToUnit.kt")
         public void testCoercionToUnit() throws Exception {
-            doTest("idea/testData/checker/regression/CoercionToUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/CoercionToUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("createInnerInstance.kt")
         public void testCreateInnerInstance() throws Exception {
-            doTest("idea/testData/checker/regression/createInnerInstance.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/createInnerInstance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoubleDefine.kt")
         public void testDoubleDefine() throws Exception {
-            doTest("idea/testData/checker/regression/DoubleDefine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/DoubleDefine.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("extensionMemberInClassObject.kt")
         public void testExtensionMemberInClassObject() throws Exception {
-            doTest("idea/testData/checker/regression/extensionMemberInClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/extensionMemberInClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet11.kt")
         public void testJet11() throws Exception {
-            doTest("idea/testData/checker/regression/Jet11.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet11.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet121.kt")
         public void testJet121() throws Exception {
-            doTest("idea/testData/checker/regression/Jet121.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet121.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet124.kt")
         public void testJet124() throws Exception {
-            doTest("idea/testData/checker/regression/Jet124.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet124.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet169.kt")
         public void testJet169() throws Exception {
-            doTest("idea/testData/checker/regression/Jet169.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet169.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet17.kt")
         public void testJet17() throws Exception {
-            doTest("idea/testData/checker/regression/Jet17.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet17.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet183.kt")
         public void testJet183() throws Exception {
-            doTest("idea/testData/checker/regression/Jet183.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet183-1.kt")
         public void testJet183_1() throws Exception {
-            doTest("idea/testData/checker/regression/Jet183-1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet183-1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet53.kt")
         public void testJet53() throws Exception {
-            doTest("idea/testData/checker/regression/Jet53.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet53.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet67.kt")
         public void testJet67() throws Exception {
-            doTest("idea/testData/checker/regression/Jet67.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet67.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet68.kt")
         public void testJet68() throws Exception {
-            doTest("idea/testData/checker/regression/Jet68.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet68.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet69.kt")
         public void testJet69() throws Exception {
-            doTest("idea/testData/checker/regression/Jet69.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet69.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Jet72.kt")
         public void testJet72() throws Exception {
-            doTest("idea/testData/checker/regression/Jet72.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/Jet72.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt251.kt")
         public void testKt251() throws Exception {
-            doTest("idea/testData/checker/regression/kt251.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt251.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kt303.kt")
         public void testKt303() throws Exception {
-            doTest("idea/testData/checker/regression/kt303.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/kt303.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideResolution.kt")
         public void testOverrideResolution() throws Exception {
-            doTest("idea/testData/checker/regression/OverrideResolution.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/OverrideResolution.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ScopeForSecondaryConstructors.kt")
         public void testScopeForSecondaryConstructors() throws Exception {
-            doTest("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/ScopeForSecondaryConstructors.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpecififcityByReceiver.kt")
         public void testSpecififcityByReceiver() throws Exception {
-            doTest("idea/testData/checker/regression/SpecififcityByReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/SpecififcityByReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WrongTraceInCallResolver.kt")
         public void testWrongTraceInCallResolver() throws Exception {
-            doTest("idea/testData/checker/regression/WrongTraceInCallResolver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/regression/WrongTraceInCallResolver.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/checker/recovery")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Recovery extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRecovery() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -423,17 +501,20 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("namelessMembers.kt")
         public void testNamelessMembers() throws Exception {
-            doTest("idea/testData/checker/recovery/namelessMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("namelessToplevelDeclarations.kt")
         public void testNamelessToplevelDeclarations() throws Exception {
-            doTest("idea/testData/checker/recovery/namelessToplevelDeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/recovery/namelessToplevelDeclarations.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/checker/rendering")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Rendering extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInRendering() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -441,12 +522,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("TypeInferenceError.kt")
         public void testTypeInferenceError() throws Exception {
-            doTest("idea/testData/checker/rendering/TypeInferenceError.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/rendering/TypeInferenceError.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/checker/duplicateJvmSignature")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DuplicateJvmSignature.Fields.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.TraitImpl.class})
     public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
@@ -454,6 +537,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         }
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Fields extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInFields() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -461,12 +545,14 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
             
             @TestMetadata("classObjectCopiedFieldObject.kt")
             public void testClassObjectCopiedFieldObject() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/fields/classObjectCopiedFieldObject.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionAndProperty extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInFunctionAndProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -474,47 +560,56 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
             
             @TestMetadata("class.kt")
             public void testClass() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("classObject.kt")
             public void testClassObject() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/classObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/localClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/nestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("object.kt")
             public void testObject() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/object.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("objectExpression.kt")
             public void testObjectExpression() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/objectExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevel.kt")
             public void testTopLevel() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/topLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("trait.kt")
             public void testTrait() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty/trait.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TraitImpl extends AbstractJetPsiCheckerTest {
             public void testAllFilesPresentInTraitImpl() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -522,7 +617,8 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
             
             @TestMetadata("twoTraits.kt")
             public void testTwoTraits() throws Exception {
-                doTest("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl/twoTraits.kt");
+                doTest(fileName);
             }
             
         }
@@ -538,6 +634,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
     }
     
     @TestMetadata("idea/testData/checker/infos")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Infos extends AbstractJetPsiCheckerTest {
         public void testAllFilesPresentInInfos() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -545,32 +642,38 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
         
         @TestMetadata("Autocasts.kt")
         public void testAutocasts() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/Autocasts.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/Autocasts.kt");
+            doTestWithInfos(fileName);
         }
         
         @TestMetadata("CapturedInInlinedClosure.kt")
         public void testCapturedInInlinedClosure() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/CapturedInInlinedClosure.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/CapturedInInlinedClosure.kt");
+            doTestWithInfos(fileName);
         }
         
         @TestMetadata("PropertiesWithBackingFields.kt")
         public void testPropertiesWithBackingFields() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/PropertiesWithBackingFields.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/PropertiesWithBackingFields.kt");
+            doTestWithInfos(fileName);
         }
         
         @TestMetadata("SmartCastsWithSafeAccess.kt")
         public void testSmartCastsWithSafeAccess() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/SmartCastsWithSafeAccess.kt");
+            doTestWithInfos(fileName);
         }
         
         @TestMetadata("Typos.kt")
         public void testTypos() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/Typos.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/Typos.kt");
+            doTestWithInfos(fileName);
         }
         
         @TestMetadata("WrapIntoRef.kt")
         public void testWrapIntoRef() throws Exception {
-            doTestWithInfos("idea/testData/checker/infos/WrapIntoRef.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/infos/WrapIntoRef.kt");
+            doTestWithInfos(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
index 651a60ece4f..2beeaab7ba1 100644
--- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/injava")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
@@ -36,57 +38,68 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile
     
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        doTest("idea/testData/completion/injava/Class.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Class.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        doTest("idea/testData/completion/injava/ClassMembers.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassMembers.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        doTest("idea/testData/completion/injava/ClassObject.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassObject.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassesFromNamespace.java");
+        doTest(fileName);
     }
     
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        doTest("idea/testData/completion/injava/EnumConstants.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/EnumConstants.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        doTest("idea/testData/completion/injava/Nested.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Nested.java");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/NestedObjectInstance.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedObjectInstance.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/ObjectInstance.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInstance.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        doTest("idea/testData/completion/injava/Subpackage.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Subpackage.java");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        doTest("idea/testData/completion/injava/TopLevelMembers.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/TopLevelMembers.java");
+        doTest(fileName);
     }
     
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        doTest("idea/testData/completion/injava/TraitMember.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/TraitMember.java");
+        doTest(fileName);
     }
     
     public static Test suite() {
diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java
index 3f6d0c664f1..b71102ca90b 100644
--- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/dataFlowValueRendering")
+@TestDataPath("$PROJECT_ROOT")
 public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest {
     public void testAllFilesPresentInDataFlowValueRendering() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,52 +37,62 @@ public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRe
     
     @TestMetadata("classProperty.kt")
     public void testClassProperty() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/classProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/classProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("complexIdentifier.kt")
     public void testComplexIdentifier() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("complexIdentifierWithImplicitReceiver.kt")
     public void testComplexIdentifierWithImplicitReceiver() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithImplicitReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("complexIdentifierWithInitiallyNullableReceiver.kt")
     public void testComplexIdentifierWithInitiallyNullableReceiver() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithInitiallyNullableReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("complexIdentifierWithReceiver.kt")
     public void testComplexIdentifierWithReceiver() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/complexIdentifierWithReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("multipleVariables.kt")
     public void testMultipleVariables() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/multipleVariables.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/multipleVariables.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("packageProperty.kt")
     public void testPackageProperty() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/packageProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/packageProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("receivers.kt")
     public void testReceivers() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/receivers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/receivers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("smartCast.kt")
     public void testSmartCast() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/smartCast.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartCast.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("smartNotNull.kt")
     public void testSmartNotNull() throws Exception {
-        doTest("idea/testData/dataFlowValueRendering/smartNotNull.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/dataFlowValueRendering/smartNotNull.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
index d5fe95fe459..f28926efeda 100644
--- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,16 +31,19 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JSBasicCompletionTestGenerated.Common.class, JSBasicCompletionTestGenerated.Js.class})
 public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class})
     public static class Common extends AbstractJSBasicCompletionTest {
         @TestMetadata("AfterFloatOnNewLine.kt")
         public void testAfterFloatOnNewLine() throws Exception {
-            doTest("idea/testData/completion/basic/common/AfterFloatOnNewLine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AfterFloatOnNewLine.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AfterIntSeparatedWithComments.kt")
         public void testAfterIntSeparatedWithComments() throws Exception {
-            doTest("idea/testData/completion/basic/common/AfterIntSeparatedWithComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AfterIntSeparatedWithComments.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInCommon() throws Exception {
@@ -48,415 +52,498 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
         
         @TestMetadata("AutoCastAfterIf.kt")
         public void testAutoCastAfterIf() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastAfterIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastAfterIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastAfterIfMethod.kt")
         public void testAutoCastAfterIfMethod() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastForThis.kt")
         public void testAutoCastForThis() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastForThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastForThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastInWhen.kt")
         public void testAutoCastInWhen() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BasicAny.kt")
         public void testBasicAny() throws Exception {
-            doTest("idea/testData/completion/basic/common/BasicAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BasicAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BasicInt.kt")
         public void testBasicInt() throws Exception {
-            doTest("idea/testData/completion/basic/common/BasicInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BasicInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BeforeDotInCall.kt")
         public void testBeforeDotInCall() throws Exception {
-            doTest("idea/testData/completion/basic/common/BeforeDotInCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BeforeDotInCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CallLocalLambda.kt")
         public void testCallLocalLambda() throws Exception {
-            doTest("idea/testData/completion/basic/common/CallLocalLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/CallLocalLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectElementsInClass.kt")
         public void testClassObjectElementsInClass() throws Exception {
-            doTest("idea/testData/completion/basic/common/classObjectElementsInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/classObjectElementsInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassRedeclaration1.kt")
         public void testClassRedeclaration1() throws Exception {
-            doTest("idea/testData/completion/basic/common/ClassRedeclaration1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ClassRedeclaration1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassRedeclaration2.kt")
         public void testClassRedeclaration2() throws Exception {
-            doTest("idea/testData/completion/basic/common/ClassRedeclaration2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ClassRedeclaration2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CompletionInSetter.kt")
         public void testCompletionInSetter() throws Exception {
-            doTest("idea/testData/completion/basic/common/CompletionInSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/CompletionInSetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoNotCompleteForErrorReceivers.kt")
         public void testDoNotCompleteForErrorReceivers() throws Exception {
-            doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoNotCompleteForErrorReceiversForce.kt")
         public void testDoNotCompleteForErrorReceiversForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendClassName.kt")
         public void testExtendClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtendClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtendClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendQualifiedClassName.kt")
         public void testExtendQualifiedClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionForProperty.kt")
         public void testExtensionForProperty() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionForProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionForProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunReceiver.kt")
         public void testExtensionFunReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionFunReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionFunReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunReceiverForce.kt")
         public void testExtensionFunReceiverForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionInsideFunction.kt")
         public void testExtensionInsideFunction() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionInsideFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionInsideFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionToIntInFloatStyle.kt")
         public void testExtensionToIntInFloatStyle() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionToIntInFloatStyle.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionToIntInFloatStyle.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithAdditionalTypeParameters.kt")
         public void testExtensionWithAdditionalTypeParameters() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithGenericParamInReceiver.kt")
         public void testExtensionWithGenericParamInReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithGenericReceiver.kt")
         public void testExtensionWithGenericReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithInternalGenericParameters.kt")
         public void testExtensionWithInternalGenericParameters() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt")
         public void testExtensionWithManyTypeParamsInReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FromImports.kt")
         public void testFromImports() throws Exception {
-            doTest("idea/testData/completion/basic/common/FromImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FromImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionCompletionFormatting.kt")
         public void testFunctionCompletionFormatting() throws Exception {
-            doTest("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionVariableCallArgument.kt")
         public void testFunctionVariableCallArgument() throws Exception {
-            doTest("idea/testData/completion/basic/common/FunctionVariableCallArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FunctionVariableCallArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("HigherOrderFunction1.kt")
         public void testHigherOrderFunction1() throws Exception {
-            doTest("idea/testData/completion/basic/common/HigherOrderFunction1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/HigherOrderFunction1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InCallExpression.kt")
         public void testInCallExpression() throws Exception {
-            doTest("idea/testData/completion/basic/common/InCallExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InCallExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InClassInitializer.kt")
         public void testInClassInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InClassInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InClassInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InClassPropertyAccessor.kt")
         public void testInClassPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InClassPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InClassPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InEmptyImport.kt")
         public void testInEmptyImport() throws Exception {
-            doTest("idea/testData/completion/basic/common/InEmptyImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InEmptyImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InExpressionNoPrefix.kt")
         public void testInExpressionNoPrefix() throws Exception {
-            doTest("idea/testData/completion/basic/common/InExpressionNoPrefix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InExpressionNoPrefix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InExtendTypeAnnotation.kt")
         public void testInExtendTypeAnnotation() throws Exception {
-            doTest("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFileWithMultiDeclaration.kt")
         public void testInFileWithMultiDeclaration() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFileWithTypedef.kt")
         public void testInFileWithTypedef() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFileWithTypedef.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFileWithTypedef.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFunInClassInitializer.kt")
         public void testInFunInClassInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFunctionArguments.kt")
         public void testInFunctionArguments() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFunctionArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFunctionArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InGlobalPropertyInitializer.kt")
         public void testInGlobalPropertyInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InImport.kt")
         public void testInImport() throws Exception {
-            doTest("idea/testData/completion/basic/common/InImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInitializerInPropertyAccessor.kt")
         public void testInInitializerInPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InLocalObjectDeclaration.kt")
         public void testInLocalObjectDeclaration() throws Exception {
-            doTest("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InLongDotQualifiedExpression.kt")
         public void testInLongDotQualifiedExpression() throws Exception {
-            doTest("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InMiddleOfPackage.kt")
         public void testInMiddleOfPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/InMiddleOfPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InMiddleOfPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InMiddleOfPackageDirective.kt")
         public void testInMiddleOfPackageDirective() throws Exception {
-            doTest("idea/testData/completion/basic/common/InMiddleOfPackageDirective.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InMiddleOfPackageDirective.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InObjectInDelegationSpecifier.kt")
         public void testInObjectInDelegationSpecifier() throws Exception {
-            doTest("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPackageBegin.kt")
         public void testInPackageBegin() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPackageBegin.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPackageBegin.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InParametersTypes.kt")
         public void testInParametersTypes() throws Exception {
-            doTest("idea/testData/completion/basic/common/InParametersTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InParametersTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InParametersTypesForce.kt")
         public void testInParametersTypesForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/InParametersTypesForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InParametersTypesForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPropertyAccessor.kt")
         public void testInPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPropertyInitializer.kt")
         public void testInPropertyInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InTypeAnnotation.kt")
         public void testInTypeAnnotation() throws Exception {
-            doTest("idea/testData/completion/basic/common/InTypeAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InTypeAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("JavaPackage.kt")
         public void testJavaPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/JavaPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/JavaPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LocalMultideclarationValues.kt")
         public void testLocalMultideclarationValues() throws Exception {
-            doTest("idea/testData/completion/basic/common/LocalMultideclarationValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/LocalMultideclarationValues.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
-            doTest("idea/testData/completion/basic/common/NamedObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NamedObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassNameForExtension.kt")
         public void testNestedClassNameForExtension() throws Exception {
-            doTest("idea/testData/completion/basic/common/NestedClassNameForExtension.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NestedClassNameForExtension.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassNameForExtension2.kt")
         public void testNestedClassNameForExtension2() throws Exception {
-            doTest("idea/testData/completion/basic/common/NestedClassNameForExtension2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NestedClassNameForExtension2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoClassNameDuplication.kt")
         public void testNoClassNameDuplication() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoClassNameDuplication.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoClassNameDuplication.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterBigFloat.kt")
         public void testNoCompletionAfterBigFloat() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterBigFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterBigFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterFloat.kt")
         public void testNoCompletionAfterFloat() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterInt.kt")
         public void testNoCompletionAfterInt() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterLong.kt")
         public void testNoCompletionAfterLong() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterLong.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterLong.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoEmptyPackage.kt")
         public void testNoEmptyPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoEmptyPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoObjectInTypePosition.kt")
         public void testNoObjectInTypePosition() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoObjectInTypePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoObjectInTypePosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoSecondPressCompletionInAutoPopup.kt")
         public void testNoSecondPressCompletionInAutoPopup() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoSecondPressCompletionInAutoPopup.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoSecondPressCompletionInAutoPopup.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt")
         public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectRedeclaration1.kt")
         public void testObjectRedeclaration1() throws Exception {
-            doTest("idea/testData/completion/basic/common/ObjectRedeclaration1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ObjectRedeclaration1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectRedeclaration2.kt")
         public void testObjectRedeclaration2() throws Exception {
-            doTest("idea/testData/completion/basic/common/ObjectRedeclaration2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ObjectRedeclaration2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OnlyScopedClassesWithoutExplicit.kt")
         public void testOnlyScopedClassesWithoutExplicit() throws Exception {
-            doTest("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverloadFunctions.kt")
         public void testOverloadFunctions() throws Exception {
-            doTest("idea/testData/completion/basic/common/OverloadFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/OverloadFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ShortClassNamesInTypePosition.kt")
         public void testShortClassNamesInTypePosition() throws Exception {
-            doTest("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StandardJetArrayFirst.kt")
         public void testStandardJetArrayFirst() throws Exception {
-            doTest("idea/testData/completion/basic/common/StandardJetArrayFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/StandardJetArrayFirst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StandardJetDoubleFirst.kt")
         public void testStandardJetDoubleFirst() throws Exception {
-            doTest("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SubpackageInFun.kt")
         public void testSubpackageInFun() throws Exception {
-            doTest("idea/testData/completion/basic/common/SubpackageInFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubpackageInFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt")
         public void testTopLevelClassCompletionInQualifiedCall() throws Exception {
-            doTest("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableClassName.kt")
         public void testVariableClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/VariableClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VariableClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityClassMembersFromExternal.kt")
         public void testVisibilityClassMembersFromExternal() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityClassMembersFromExternalForce.kt")
         public void testVisibilityClassMembersFromExternalForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityInSubclass.kt")
         public void testVisibilityInSubclass() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityInSubclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityInSubclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityInSubclassForce.kt")
         public void testVisibilityInSubclassForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/completion/basic/common/extensions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Extensions extends AbstractJSBasicCompletionTest {
             public void testAllFilesPresentInExtensions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -464,61 +551,73 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             
             @TestMetadata("ExtensionInExtendedClass.kt")
             public void testExtensionInExtendedClass() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtendedClassThis.kt")
             public void testExtensionInExtendedClassThis() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtension.kt")
             public void testExtensionInExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtensionThis.kt")
             public void testExtensionInExtensionThis() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InvalidTypeParameters.kt")
             public void testInvalidTypeParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IrrelevantExtension.kt")
             public void testIrrelevantExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaTypeExtension.kt")
             public void testJavaTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KotlinGenericTypeExtension.kt")
             public void testKotlinGenericTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KotlinTypeExtension.kt")
             public void testKotlinTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/completion/basic/common/namedParameters")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NamedParameters extends AbstractJSBasicCompletionTest {
             @TestMetadata("AfterBrace.kt")
             public void testAfterBrace() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/AfterBrace.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/AfterBrace.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AfterComma.kt")
             public void testAfterComma() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/AfterComma.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/AfterComma.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInNamedParameters() throws Exception {
@@ -527,57 +626,68 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
             
             @TestMetadata("CompactTypeNames.kt")
             public void testCompactTypeNames() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ForEmptyParametersFunction.kt")
             public void testForEmptyParametersFunction() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InParameterExpression.kt")
             public void testInParameterExpression() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedParametersFromOverloads.kt")
             public void testNamedParametersFromOverloads() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NamedParametersFromOverloads.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NamedParametersFromOverloads.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedParamsInConstructor.kt")
             public void testNamedParamsInConstructor() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NamedParamsInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NamedParamsInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoAlreadyUsedParameters.kt")
             public void testNoAlreadyUsedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NoAlreadyUsedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NoAlreadyUsedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoParamsFromUnapplicableOverload.kt")
             public void testNoParamsFromUnapplicableOverload() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NoParamsFromUnapplicableOverload.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NoParamsFromUnapplicableOverload.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotOnlyNamedParameters.kt")
             public void testNotOnlyNamedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotOnlyNamedParameters2.kt")
             public void testNotOnlyNamedParameters2() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OnlyNamedParameters.kt")
             public void testOnlyNamedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/OnlyNamedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/OnlyNamedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WithParameterExpression.kt")
             public void testWithParameterExpression() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/WithParameterExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/WithParameterExpression.kt");
+                doTest(fileName);
             }
             
         }
@@ -592,6 +702,7 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
     }
     
     @TestMetadata("idea/testData/completion/basic/js")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Js extends AbstractJSBasicCompletionTest {
         public void testAllFilesPresentInJs() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/js"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -599,17 +710,20 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes
         
         @TestMetadata("AutoForceCompletion.kt")
         public void testAutoForceCompletion() throws Exception {
-            doTest("idea/testData/completion/basic/js/AutoForceCompletion.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/js/AutoForceCompletion.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPackage.kt")
         public void testInPackage() throws Exception {
-            doTest("idea/testData/completion/basic/js/InPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/js/InPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("JSStd.kt")
         public void testJSStd() throws Exception {
-            doTest("idea/testData/completion/basic/js/JSStd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/js/JSStd.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
index 0c3adf5e2c3..60fecd5c2c1 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,16 +31,19 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JvmBasicCompletionTestGenerated.Common.class, JvmBasicCompletionTestGenerated.Java.class})
 public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
     @TestMetadata("idea/testData/completion/basic/common")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class})
     public static class Common extends AbstractJvmBasicCompletionTest {
         @TestMetadata("AfterFloatOnNewLine.kt")
         public void testAfterFloatOnNewLine() throws Exception {
-            doTest("idea/testData/completion/basic/common/AfterFloatOnNewLine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AfterFloatOnNewLine.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AfterIntSeparatedWithComments.kt")
         public void testAfterIntSeparatedWithComments() throws Exception {
-            doTest("idea/testData/completion/basic/common/AfterIntSeparatedWithComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AfterIntSeparatedWithComments.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInCommon() throws Exception {
@@ -48,415 +52,498 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
         
         @TestMetadata("AutoCastAfterIf.kt")
         public void testAutoCastAfterIf() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastAfterIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastAfterIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastAfterIfMethod.kt")
         public void testAutoCastAfterIfMethod() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastAfterIfMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastForThis.kt")
         public void testAutoCastForThis() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastForThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastForThis.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AutoCastInWhen.kt")
         public void testAutoCastInWhen() throws Exception {
-            doTest("idea/testData/completion/basic/common/AutoCastInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/AutoCastInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BasicAny.kt")
         public void testBasicAny() throws Exception {
-            doTest("idea/testData/completion/basic/common/BasicAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BasicAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BasicInt.kt")
         public void testBasicInt() throws Exception {
-            doTest("idea/testData/completion/basic/common/BasicInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BasicInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BeforeDotInCall.kt")
         public void testBeforeDotInCall() throws Exception {
-            doTest("idea/testData/completion/basic/common/BeforeDotInCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/BeforeDotInCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CallLocalLambda.kt")
         public void testCallLocalLambda() throws Exception {
-            doTest("idea/testData/completion/basic/common/CallLocalLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/CallLocalLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectElementsInClass.kt")
         public void testClassObjectElementsInClass() throws Exception {
-            doTest("idea/testData/completion/basic/common/classObjectElementsInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/classObjectElementsInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassRedeclaration1.kt")
         public void testClassRedeclaration1() throws Exception {
-            doTest("idea/testData/completion/basic/common/ClassRedeclaration1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ClassRedeclaration1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassRedeclaration2.kt")
         public void testClassRedeclaration2() throws Exception {
-            doTest("idea/testData/completion/basic/common/ClassRedeclaration2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ClassRedeclaration2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CompletionInSetter.kt")
         public void testCompletionInSetter() throws Exception {
-            doTest("idea/testData/completion/basic/common/CompletionInSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/CompletionInSetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoNotCompleteForErrorReceivers.kt")
         public void testDoNotCompleteForErrorReceivers() throws Exception {
-            doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoNotCompleteForErrorReceiversForce.kt")
         public void testDoNotCompleteForErrorReceiversForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendClassName.kt")
         public void testExtendClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtendClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtendClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtendQualifiedClassName.kt")
         public void testExtendQualifiedClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtendQualifiedClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionForProperty.kt")
         public void testExtensionForProperty() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionForProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionForProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunReceiver.kt")
         public void testExtensionFunReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionFunReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionFunReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunReceiverForce.kt")
         public void testExtensionFunReceiverForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionInsideFunction.kt")
         public void testExtensionInsideFunction() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionInsideFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionInsideFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionToIntInFloatStyle.kt")
         public void testExtensionToIntInFloatStyle() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionToIntInFloatStyle.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionToIntInFloatStyle.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithAdditionalTypeParameters.kt")
         public void testExtensionWithAdditionalTypeParameters() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithAdditionalTypeParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithGenericParamInReceiver.kt")
         public void testExtensionWithGenericParamInReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithGenericParamInReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithGenericReceiver.kt")
         public void testExtensionWithGenericReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithGenericReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithInternalGenericParameters.kt")
         public void testExtensionWithInternalGenericParameters() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithInternalGenericParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionWithManyTypeParamsInReceiver.kt")
         public void testExtensionWithManyTypeParamsInReceiver() throws Exception {
-            doTest("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ExtensionWithManyTypeParamsInReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FromImports.kt")
         public void testFromImports() throws Exception {
-            doTest("idea/testData/completion/basic/common/FromImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FromImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionCompletionFormatting.kt")
         public void testFunctionCompletionFormatting() throws Exception {
-            doTest("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FunctionCompletionFormatting.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionVariableCallArgument.kt")
         public void testFunctionVariableCallArgument() throws Exception {
-            doTest("idea/testData/completion/basic/common/FunctionVariableCallArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/FunctionVariableCallArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("HigherOrderFunction1.kt")
         public void testHigherOrderFunction1() throws Exception {
-            doTest("idea/testData/completion/basic/common/HigherOrderFunction1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/HigherOrderFunction1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InCallExpression.kt")
         public void testInCallExpression() throws Exception {
-            doTest("idea/testData/completion/basic/common/InCallExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InCallExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InClassInitializer.kt")
         public void testInClassInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InClassInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InClassInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InClassPropertyAccessor.kt")
         public void testInClassPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InClassPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InClassPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InEmptyImport.kt")
         public void testInEmptyImport() throws Exception {
-            doTest("idea/testData/completion/basic/common/InEmptyImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InEmptyImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InExpressionNoPrefix.kt")
         public void testInExpressionNoPrefix() throws Exception {
-            doTest("idea/testData/completion/basic/common/InExpressionNoPrefix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InExpressionNoPrefix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InExtendTypeAnnotation.kt")
         public void testInExtendTypeAnnotation() throws Exception {
-            doTest("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InExtendTypeAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFileWithMultiDeclaration.kt")
         public void testInFileWithMultiDeclaration() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFileWithMultiDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFileWithTypedef.kt")
         public void testInFileWithTypedef() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFileWithTypedef.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFileWithTypedef.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFunInClassInitializer.kt")
         public void testInFunInClassInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFunInClassInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InFunctionArguments.kt")
         public void testInFunctionArguments() throws Exception {
-            doTest("idea/testData/completion/basic/common/InFunctionArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InFunctionArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InGlobalPropertyInitializer.kt")
         public void testInGlobalPropertyInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InGlobalPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InImport.kt")
         public void testInImport() throws Exception {
-            doTest("idea/testData/completion/basic/common/InImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InInitializerInPropertyAccessor.kt")
         public void testInInitializerInPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InInitializerInPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InLocalObjectDeclaration.kt")
         public void testInLocalObjectDeclaration() throws Exception {
-            doTest("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InLocalObjectDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InLongDotQualifiedExpression.kt")
         public void testInLongDotQualifiedExpression() throws Exception {
-            doTest("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InLongDotQualifiedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InMiddleOfPackage.kt")
         public void testInMiddleOfPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/InMiddleOfPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InMiddleOfPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InMiddleOfPackageDirective.kt")
         public void testInMiddleOfPackageDirective() throws Exception {
-            doTest("idea/testData/completion/basic/common/InMiddleOfPackageDirective.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InMiddleOfPackageDirective.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InObjectInDelegationSpecifier.kt")
         public void testInObjectInDelegationSpecifier() throws Exception {
-            doTest("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InObjectInDelegationSpecifier.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPackageBegin.kt")
         public void testInPackageBegin() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPackageBegin.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPackageBegin.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InParametersTypes.kt")
         public void testInParametersTypes() throws Exception {
-            doTest("idea/testData/completion/basic/common/InParametersTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InParametersTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InParametersTypesForce.kt")
         public void testInParametersTypesForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/InParametersTypesForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InParametersTypesForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPropertyAccessor.kt")
         public void testInPropertyAccessor() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPropertyAccessor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPropertyAccessor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPropertyInitializer.kt")
         public void testInPropertyInitializer() throws Exception {
-            doTest("idea/testData/completion/basic/common/InPropertyInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InPropertyInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InTypeAnnotation.kt")
         public void testInTypeAnnotation() throws Exception {
-            doTest("idea/testData/completion/basic/common/InTypeAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/InTypeAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("JavaPackage.kt")
         public void testJavaPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/JavaPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/JavaPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LocalMultideclarationValues.kt")
         public void testLocalMultideclarationValues() throws Exception {
-            doTest("idea/testData/completion/basic/common/LocalMultideclarationValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/LocalMultideclarationValues.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
-            doTest("idea/testData/completion/basic/common/NamedObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NamedObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassNameForExtension.kt")
         public void testNestedClassNameForExtension() throws Exception {
-            doTest("idea/testData/completion/basic/common/NestedClassNameForExtension.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NestedClassNameForExtension.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassNameForExtension2.kt")
         public void testNestedClassNameForExtension2() throws Exception {
-            doTest("idea/testData/completion/basic/common/NestedClassNameForExtension2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NestedClassNameForExtension2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoClassNameDuplication.kt")
         public void testNoClassNameDuplication() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoClassNameDuplication.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoClassNameDuplication.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterBigFloat.kt")
         public void testNoCompletionAfterBigFloat() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterBigFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterBigFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterFloat.kt")
         public void testNoCompletionAfterFloat() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterInt.kt")
         public void testNoCompletionAfterInt() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoCompletionAfterLong.kt")
         public void testNoCompletionAfterLong() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoCompletionAfterLong.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoCompletionAfterLong.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoEmptyPackage.kt")
         public void testNoEmptyPackage() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoEmptyPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoEmptyPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoObjectInTypePosition.kt")
         public void testNoObjectInTypePosition() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoObjectInTypePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoObjectInTypePosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoSecondPressCompletionInAutoPopup.kt")
         public void testNoSecondPressCompletionInAutoPopup() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoSecondPressCompletionInAutoPopup.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoSecondPressCompletionInAutoPopup.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoTopLevelCompletionInQualifiedUserTypes.kt")
         public void testNoTopLevelCompletionInQualifiedUserTypes() throws Exception {
-            doTest("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/NoTopLevelCompletionInQualifiedUserTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectRedeclaration1.kt")
         public void testObjectRedeclaration1() throws Exception {
-            doTest("idea/testData/completion/basic/common/ObjectRedeclaration1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ObjectRedeclaration1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectRedeclaration2.kt")
         public void testObjectRedeclaration2() throws Exception {
-            doTest("idea/testData/completion/basic/common/ObjectRedeclaration2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ObjectRedeclaration2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OnlyScopedClassesWithoutExplicit.kt")
         public void testOnlyScopedClassesWithoutExplicit() throws Exception {
-            doTest("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverloadFunctions.kt")
         public void testOverloadFunctions() throws Exception {
-            doTest("idea/testData/completion/basic/common/OverloadFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/OverloadFunctions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ShortClassNamesInTypePosition.kt")
         public void testShortClassNamesInTypePosition() throws Exception {
-            doTest("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/ShortClassNamesInTypePosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StandardJetArrayFirst.kt")
         public void testStandardJetArrayFirst() throws Exception {
-            doTest("idea/testData/completion/basic/common/StandardJetArrayFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/StandardJetArrayFirst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StandardJetDoubleFirst.kt")
         public void testStandardJetDoubleFirst() throws Exception {
-            doTest("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/StandardJetDoubleFirst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SubpackageInFun.kt")
         public void testSubpackageInFun() throws Exception {
-            doTest("idea/testData/completion/basic/common/SubpackageInFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/SubpackageInFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TopLevelClassCompletionInQualifiedCall.kt")
         public void testTopLevelClassCompletionInQualifiedCall() throws Exception {
-            doTest("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/TopLevelClassCompletionInQualifiedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableClassName.kt")
         public void testVariableClassName() throws Exception {
-            doTest("idea/testData/completion/basic/common/VariableClassName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VariableClassName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityClassMembersFromExternal.kt")
         public void testVisibilityClassMembersFromExternal() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityClassMembersFromExternalForce.kt")
         public void testVisibilityClassMembersFromExternalForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityInSubclass.kt")
         public void testVisibilityInSubclass() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityInSubclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityInSubclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VisibilityInSubclassForce.kt")
         public void testVisibilityInSubclassForce() throws Exception {
-            doTest("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/VisibilityInSubclassForce.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/completion/basic/common/extensions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Extensions extends AbstractJvmBasicCompletionTest {
             public void testAllFilesPresentInExtensions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -464,61 +551,73 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             
             @TestMetadata("ExtensionInExtendedClass.kt")
             public void testExtensionInExtendedClass() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtendedClassThis.kt")
             public void testExtensionInExtendedClassThis() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtendedClassThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtension.kt")
             public void testExtensionInExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionInExtensionThis.kt")
             public void testExtensionInExtensionThis() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/ExtensionInExtensionThis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InvalidTypeParameters.kt")
             public void testInvalidTypeParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/InvalidTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("IrrelevantExtension.kt")
             public void testIrrelevantExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/IrrelevantExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaTypeExtension.kt")
             public void testJavaTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/JavaTypeExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KotlinGenericTypeExtension.kt")
             public void testKotlinGenericTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/KotlinGenericTypeExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("KotlinTypeExtension.kt")
             public void testKotlinTypeExtension() throws Exception {
-                doTest("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/extensions/KotlinTypeExtension.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/completion/basic/common/namedParameters")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NamedParameters extends AbstractJvmBasicCompletionTest {
             @TestMetadata("AfterBrace.kt")
             public void testAfterBrace() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/AfterBrace.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/AfterBrace.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("AfterComma.kt")
             public void testAfterComma() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/AfterComma.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/AfterComma.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInNamedParameters() throws Exception {
@@ -527,57 +626,68 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
             
             @TestMetadata("CompactTypeNames.kt")
             public void testCompactTypeNames() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/CompactTypeNames.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ForEmptyParametersFunction.kt")
             public void testForEmptyParametersFunction() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/ForEmptyParametersFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("InParameterExpression.kt")
             public void testInParameterExpression() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/InParameterExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedParametersFromOverloads.kt")
             public void testNamedParametersFromOverloads() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NamedParametersFromOverloads.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NamedParametersFromOverloads.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NamedParamsInConstructor.kt")
             public void testNamedParamsInConstructor() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NamedParamsInConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NamedParamsInConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoAlreadyUsedParameters.kt")
             public void testNoAlreadyUsedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NoAlreadyUsedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NoAlreadyUsedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NoParamsFromUnapplicableOverload.kt")
             public void testNoParamsFromUnapplicableOverload() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NoParamsFromUnapplicableOverload.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NoParamsFromUnapplicableOverload.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotOnlyNamedParameters.kt")
             public void testNotOnlyNamedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotOnlyNamedParameters2.kt")
             public void testNotOnlyNamedParameters2() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/NotOnlyNamedParameters2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("OnlyNamedParameters.kt")
             public void testOnlyNamedParameters() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/OnlyNamedParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/OnlyNamedParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WithParameterExpression.kt")
             public void testWithParameterExpression() throws Exception {
-                doTest("idea/testData/completion/basic/common/namedParameters/WithParameterExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/common/namedParameters/WithParameterExpression.kt");
+                doTest(fileName);
             }
             
         }
@@ -592,6 +702,7 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
     }
     
     @TestMetadata("idea/testData/completion/basic/java")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Java extends AbstractJvmBasicCompletionTest {
         public void testAllFilesPresentInJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/java"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -599,47 +710,56 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT
         
         @TestMetadata("AutoForceCompletion.kt")
         public void testAutoForceCompletion() throws Exception {
-            doTest("idea/testData/completion/basic/java/AutoForceCompletion.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/AutoForceCompletion.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFromStandardLibrary.kt")
         public void testExtensionFromStandardLibrary() throws Exception {
-            doTest("idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InPackage.kt")
         public void testInPackage() throws Exception {
-            doTest("idea/testData/completion/basic/java/InPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/InPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("JavaClassNames.kt")
         public void testJavaClassNames() throws Exception {
-            doTest("idea/testData/completion/basic/java/JavaClassNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/JavaClassNames.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoClassNameDuplicationForRuntimeClass.kt")
         public void testNoClassNameDuplicationForRuntimeClass() throws Exception {
-            doTest("idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportedJavaClassDuplication.kt")
         public void testNoImportedJavaClassDuplication() throws Exception {
-            doTest("idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyMetadata.kt")
         public void testPropertyMetadata() throws Exception {
-            doTest("idea/testData/completion/basic/java/PropertyMetadata.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/PropertyMetadata.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TopLevelFromStandardLibrary.kt")
         public void testTopLevelFromStandardLibrary() throws Exception {
-            doTest("idea/testData/completion/basic/java/TopLevelFromStandardLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/TopLevelFromStandardLibrary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TopLevelFromStandardLibraryWithoutParam.kt")
         public void testTopLevelFromStandardLibraryWithoutParam() throws Exception {
-            doTest("idea/testData/completion/basic/java/TopLevelFromStandardLibraryWithoutParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/java/TopLevelFromStandardLibraryWithoutParam.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
index 4964db3334c..a630cef9c16 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,25 +29,30 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/smart")
+@TestDataPath("$PROJECT_ROOT")
 public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
     @TestMetadata("AfterAs.kt")
     public void testAfterAs() throws Exception {
-        doTest("idea/testData/completion/smart/AfterAs.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AfterAs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterAs2.kt")
     public void testAfterAs2() throws Exception {
-        doTest("idea/testData/completion/smart/AfterAs2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AfterAs2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterAs3.kt")
     public void testAfterAs3() throws Exception {
-        doTest("idea/testData/completion/smart/AfterAs3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AfterAs3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterExclSign.kt")
     public void testAfterExclSign() throws Exception {
-        doTest("idea/testData/completion/smart/AfterExclSign.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AfterExclSign.kt");
+        doTest(fileName);
     }
     
     public void testAllFilesPresentInSmart() throws Exception {
@@ -55,532 +61,638 @@ public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionT
     
     @TestMetadata("AnonymousObject1.kt")
     public void testAnonymousObject1() throws Exception {
-        doTest("idea/testData/completion/smart/AnonymousObject1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AnonymousObject1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObject2.kt")
     public void testAnonymousObject2() throws Exception {
-        doTest("idea/testData/completion/smart/AnonymousObject2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AnonymousObject2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObjectForJavaInterface.kt")
     public void testAnonymousObjectForJavaInterface() throws Exception {
-        doTest("idea/testData/completion/smart/AnonymousObjectForJavaInterface.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AnonymousObjectForJavaInterface.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnyExpected.kt")
     public void testAnyExpected() throws Exception {
-        doTest("idea/testData/completion/smart/AnyExpected.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AnyExpected.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoCastedType.kt")
     public void testAutoCastedType() throws Exception {
-        doTest("idea/testData/completion/smart/AutoCastedType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoCastedType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoCastedTypeWithQualifier.kt")
     public void testAutoCastedTypeWithQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/AutoCastedTypeWithQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoCastedTypeWithQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoNotNullType.kt")
     public void testAutoNotNullType() throws Exception {
-        doTest("idea/testData/completion/smart/AutoNotNullType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoNotNullType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoNotNullType2.kt")
     public void testAutoNotNullType2() throws Exception {
-        doTest("idea/testData/completion/smart/AutoNotNullType2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoNotNullType2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoNotNullTypeForConstructorParameter.kt")
     public void testAutoNotNullTypeForConstructorParameter() throws Exception {
-        doTest("idea/testData/completion/smart/AutoNotNullTypeForConstructorParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoNotNullTypeForConstructorParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoNotNullTypeWithQualifier.kt")
     public void testAutoNotNullTypeWithQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/AutoNotNullTypeWithQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/AutoNotNullTypeWithQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("BeforeArgumentWithBinaryOperation.kt")
     public void testBeforeArgumentWithBinaryOperation() throws Exception {
-        doTest("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("BeforeArgumentWithBinaryOperation2.kt")
     public void testBeforeArgumentWithBinaryOperation2() throws Exception {
-        doTest("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("BeforeArgumentWithBinaryOperation3.kt")
     public void testBeforeArgumentWithBinaryOperation3() throws Exception {
-        doTest("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/BeforeArgumentWithBinaryOperation3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("BooleanExpected.kt")
     public void testBooleanExpected() throws Exception {
-        doTest("idea/testData/completion/smart/BooleanExpected.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/BooleanExpected.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ChainedCall.kt")
     public void testChainedCall() throws Exception {
-        doTest("idea/testData/completion/smart/ChainedCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ChainedCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMembers.kt")
     public void testClassObjectMembers() throws Exception {
-        doTest("idea/testData/completion/smart/ClassObjectMembers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ClassObjectMembers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMembersForNullable.kt")
     public void testClassObjectMembersForNullable() throws Exception {
-        doTest("idea/testData/completion/smart/ClassObjectMembersForNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ClassObjectMembersForNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Constructor.kt")
     public void testConstructor() throws Exception {
-        doTest("idea/testData/completion/smart/Constructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Constructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForGenericType.kt")
     public void testConstructorForGenericType() throws Exception {
-        doTest("idea/testData/completion/smart/ConstructorForGenericType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ConstructorForGenericType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForJavaClass.kt")
     public void testConstructorForJavaClass() throws Exception {
-        doTest("idea/testData/completion/smart/ConstructorForJavaClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ConstructorForJavaClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForNullable.kt")
     public void testConstructorForNullable() throws Exception {
-        doTest("idea/testData/completion/smart/ConstructorForNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ConstructorForNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("EmptyPrefix.kt")
     public void testEmptyPrefix() throws Exception {
-        doTest("idea/testData/completion/smart/EmptyPrefix.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/EmptyPrefix.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("EnumMembers.kt")
     public void testEnumMembers() throws Exception {
-        doTest("idea/testData/completion/smart/EnumMembers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/EnumMembers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("EqOperator.kt")
     public void testEqOperator() throws Exception {
-        doTest("idea/testData/completion/smart/EqOperator.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/EqOperator.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference1.kt")
     public void testFunctionReference1() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference3.kt")
     public void testFunctionReference3() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference4.kt")
     public void testFunctionReference4() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference5.kt")
     public void testFunctionReference5() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference6.kt")
     public void testFunctionReference6() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference6.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference6.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference7.kt")
     public void testFunctionReference7() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference7.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference7.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference9.kt")
     public void testFunctionReference9() throws Exception {
-        doTest("idea/testData/completion/smart/FunctionReference9.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/FunctionReference9.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GenericMethodArgument.kt")
     public void testGenericMethodArgument() throws Exception {
-        doTest("idea/testData/completion/smart/GenericMethodArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/GenericMethodArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfCondition.kt")
     public void testIfCondition() throws Exception {
-        doTest("idea/testData/completion/smart/IfCondition.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfCondition.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue1.kt")
     public void testIfValue1() throws Exception {
-        doTest("idea/testData/completion/smart/IfValue1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValue1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue2.kt")
     public void testIfValue2() throws Exception {
-        doTest("idea/testData/completion/smart/IfValue2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValue2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue3.kt")
     public void testIfValue3() throws Exception {
-        doTest("idea/testData/completion/smart/IfValue3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValue3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue4.kt")
     public void testIfValue4() throws Exception {
-        doTest("idea/testData/completion/smart/IfValue4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValue4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValueInBlock1.kt")
     public void testIfValueInBlock1() throws Exception {
-        doTest("idea/testData/completion/smart/IfValueInBlock1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValueInBlock1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValueInBlock2.kt")
     public void testIfValueInBlock2() throws Exception {
-        doTest("idea/testData/completion/smart/IfValueInBlock2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/IfValueInBlock2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ImplicitlyTypedFunBody.kt")
     public void testImplicitlyTypedFunBody() throws Exception {
-        doTest("idea/testData/completion/smart/ImplicitlyTypedFunBody.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ImplicitlyTypedFunBody.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ImplicitlyTypedValInitializer1.kt")
     public void testImplicitlyTypedValInitializer1() throws Exception {
-        doTest("idea/testData/completion/smart/ImplicitlyTypedValInitializer1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ImplicitlyTypedValInitializer1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ImplicitlyTypedValInitializer2.kt")
     public void testImplicitlyTypedValInitializer2() throws Exception {
-        doTest("idea/testData/completion/smart/ImplicitlyTypedValInitializer2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ImplicitlyTypedValInitializer2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator1.kt")
     public void testInElvisOperator1() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator2.kt")
     public void testInElvisOperator2() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator3.kt")
     public void testInElvisOperator3() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator4.kt")
     public void testInElvisOperator4() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator5.kt")
     public void testInElvisOperator5() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator6.kt")
     public void testInElvisOperator6() throws Exception {
-        doTest("idea/testData/completion/smart/InElvisOperator6.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InElvisOperator6.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InaccessibleConstructor.kt")
     public void testInaccessibleConstructor() throws Exception {
-        doTest("idea/testData/completion/smart/InaccessibleConstructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InaccessibleConstructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InsideIdentifier.kt")
     public void testInsideIdentifier() throws Exception {
-        doTest("idea/testData/completion/smart/InsideIdentifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InsideIdentifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InvokeFunctionVariable.kt")
     public void testInvokeFunctionVariable() throws Exception {
-        doTest("idea/testData/completion/smart/InvokeFunctionVariable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/InvokeFunctionVariable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaEnumMembers.kt")
     public void testJavaEnumMembers() throws Exception {
-        doTest("idea/testData/completion/smart/JavaEnumMembers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaEnumMembers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaEnumMembersAfterQualifier.kt")
     public void testJavaEnumMembersAfterQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaEnumMembersAfterQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaEnumMembersForNullable.kt")
     public void testJavaEnumMembersForNullable() throws Exception {
-        doTest("idea/testData/completion/smart/JavaEnumMembersForNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaEnumMembersForNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticFields.kt")
     public void testJavaStaticFields() throws Exception {
-        doTest("idea/testData/completion/smart/JavaStaticFields.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaStaticFields.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticFieldsForNullable.kt")
     public void testJavaStaticFieldsForNullable() throws Exception {
-        doTest("idea/testData/completion/smart/JavaStaticFieldsForNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaStaticFieldsForNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticMethods.kt")
     public void testJavaStaticMethods() throws Exception {
-        doTest("idea/testData/completion/smart/JavaStaticMethods.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/JavaStaticMethods.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda1.kt")
     public void testLambda1() throws Exception {
-        doTest("idea/testData/completion/smart/Lambda1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda2.kt")
     public void testLambda2() throws Exception {
-        doTest("idea/testData/completion/smart/Lambda2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda3.kt")
     public void testLambda3() throws Exception {
-        doTest("idea/testData/completion/smart/Lambda3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda4.kt")
     public void testLambda4() throws Exception {
-        doTest("idea/testData/completion/smart/Lambda4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda5.kt")
     public void testLambda5() throws Exception {
-        doTest("idea/testData/completion/smart/Lambda5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Lambda5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MethodCallArgument.kt")
     public void testMethodCallArgument() throws Exception {
-        doTest("idea/testData/completion/smart/MethodCallArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/MethodCallArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoConstructorWithQualifier.kt")
     public void testNoConstructorWithQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/NoConstructorWithQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoConstructorWithQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoFunctionReferenceAfterQualifier.kt")
     public void testNoFunctionReferenceAfterQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/NoFunctionReferenceAfterQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoFunctionReferenceAfterQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoNothing.kt")
     public void testNoNothing() throws Exception {
-        doTest("idea/testData/completion/smart/NoNothing.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoNothing.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoPrivateOverload.kt")
     public void testNoPrivateOverload() throws Exception {
-        doTest("idea/testData/completion/smart/NoPrivateOverload.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoPrivateOverload.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoQualifiedThisOfAnonymousObject.kt")
     public void testNoQualifiedThisOfAnonymousObject() throws Exception {
-        doTest("idea/testData/completion/smart/NoQualifiedThisOfAnonymousObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoQualifiedThisOfAnonymousObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoSillyAssignment.kt")
     public void testNoSillyAssignment() throws Exception {
-        doTest("idea/testData/completion/smart/NoSillyAssignment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NoSillyAssignment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotEqOperator.kt")
     public void testNotEqOperator() throws Exception {
-        doTest("idea/testData/completion/smart/NotEqOperator.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NotEqOperator.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotSillyAssignment.kt")
     public void testNotSillyAssignment() throws Exception {
-        doTest("idea/testData/completion/smart/NotSillyAssignment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NotSillyAssignment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Null.kt")
     public void testNull() throws Exception {
-        doTest("idea/testData/completion/smart/Null.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/Null.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableThis.kt")
     public void testNullableThis() throws Exception {
-        doTest("idea/testData/completion/smart/NullableThis.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/NullableThis.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectsFromType.kt")
     public void testObjectsFromType() throws Exception {
-        doTest("idea/testData/completion/smart/ObjectsFromType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ObjectsFromType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OverloadedConstructorArgument.kt")
     public void testOverloadedConstructorArgument() throws Exception {
-        doTest("idea/testData/completion/smart/OverloadedConstructorArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/OverloadedConstructorArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OverloadedMethodCallArgument1.kt")
     public void testOverloadedMethodCallArgument1() throws Exception {
-        doTest("idea/testData/completion/smart/OverloadedMethodCallArgument1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/OverloadedMethodCallArgument1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OverloadedMethodCallArgument2.kt")
     public void testOverloadedMethodCallArgument2() throws Exception {
-        doTest("idea/testData/completion/smart/OverloadedMethodCallArgument2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/OverloadedMethodCallArgument2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OverloadedMethodCallArgument3.kt")
     public void testOverloadedMethodCallArgument3() throws Exception {
-        doTest("idea/testData/completion/smart/OverloadedMethodCallArgument3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/OverloadedMethodCallArgument3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PrivateConstructorForAbstract.kt")
     public void testPrivateConstructorForAbstract() throws Exception {
-        doTest("idea/testData/completion/smart/PrivateConstructorForAbstract.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/PrivateConstructorForAbstract.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ProtectedConstructorForAbstract.kt")
     public void testProtectedConstructorForAbstract() throws Exception {
-        doTest("idea/testData/completion/smart/ProtectedConstructorForAbstract.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/ProtectedConstructorForAbstract.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedOverloadedMethodCallArgument1.kt")
     public void testQualifiedOverloadedMethodCallArgument1() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedOverloadedMethodCallArgument1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedOverloadedMethodCallArgument1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedOverloadedMethodCallArgument2.kt")
     public void testQualifiedOverloadedMethodCallArgument2() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedOverloadedMethodCallArgument2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedOverloadedMethodCallArgument2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThis.kt")
     public void testQualifiedThis() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedThis.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedThis.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisOfExtensionFunction.kt")
     public void testQualifiedThisOfExtensionFunction() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedThisOfExtensionFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisOfExtensionLambda1.kt")
     public void testQualifiedThisOfExtensionLambda1() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedThisOfExtensionLambda1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedThisOfExtensionLambda1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisOfExtensionLambda2.kt")
     public void testQualifiedThisOfExtensionLambda2() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedThisOfExtensionLambda2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedThisOfExtensionLambda2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisOfExtensionLambda3.kt")
     public void testQualifiedThisOfExtensionLambda3() throws Exception {
-        doTest("idea/testData/completion/smart/QualifiedThisOfExtensionLambda3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/QualifiedThisOfExtensionLambda3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SAMExpected1.kt")
     public void testSAMExpected1() throws Exception {
-        doTest("idea/testData/completion/smart/SAMExpected1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/SAMExpected1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SkipUnresolvedTypes.kt")
     public void testSkipUnresolvedTypes() throws Exception {
-        doTest("idea/testData/completion/smart/SkipUnresolvedTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/SkipUnresolvedTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("This.kt")
     public void testThis() throws Exception {
-        doTest("idea/testData/completion/smart/This.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/This.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("UnresolvedExpectedType.kt")
     public void testUnresolvedExpectedType() throws Exception {
-        doTest("idea/testData/completion/smart/UnresolvedExpectedType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/UnresolvedExpectedType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VariableInitializer.kt")
     public void testVariableInitializer() throws Exception {
-        doTest("idea/testData/completion/smart/VariableInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/VariableInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue1.kt")
     public void testWhenEntryValue1() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue2.kt")
     public void testWhenEntryValue2() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue3.kt")
     public void testWhenEntryValue3() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue4.kt")
     public void testWhenEntryValue4() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue5.kt")
     public void testWhenEntryValue5() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue6.kt")
     public void testWhenEntryValue6() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue6.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue6.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue7.kt")
     public void testWhenEntryValue7() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue7.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue7.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue8.kt")
     public void testWhenEntryValue8() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue8.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue8.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenEntryValue9.kt")
     public void testWhenEntryValue9() throws Exception {
-        doTest("idea/testData/completion/smart/WhenEntryValue9.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenEntryValue9.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenWithNoSubjectEntryValue1.kt")
     public void testWhenWithNoSubjectEntryValue1() throws Exception {
-        doTest("idea/testData/completion/smart/WhenWithNoSubjectEntryValue1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenWithNoSubjectEntryValue1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenWithNoSubjectEntryValue2.kt")
     public void testWhenWithNoSubjectEntryValue2() throws Exception {
-        doTest("idea/testData/completion/smart/WhenWithNoSubjectEntryValue2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WhenWithNoSubjectEntryValue2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WithPrefix.kt")
     public void testWithPrefix() throws Exception {
-        doTest("idea/testData/completion/smart/WithPrefix.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WithPrefix.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WithQualifier.kt")
     public void testWithQualifier() throws Exception {
-        doTest("idea/testData/completion/smart/WithQualifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WithQualifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WrongNumberOfTypeArguments.kt")
     public void testWrongNumberOfTypeArguments() throws Exception {
-        doTest("idea/testData/completion/smart/WrongNumberOfTypeArguments.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/smart/WrongNumberOfTypeArguments.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java
index b11fc22d359..70449d0edd3 100644
--- a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/custom")
+@TestDataPath("$PROJECT_ROOT")
 public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest {
     public void testAllFilesPresentInCustom() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/custom"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -35,32 +37,38 @@ public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBa
     
     @TestMetadata("NamedArgumentsJava.kt")
     public void testNamedArgumentsJava() throws Exception {
-        doTest("idea/testData/completion/basic/custom/NamedArgumentsJava.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/NamedArgumentsJava.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedArgumentsKotlin.kt")
     public void testNamedArgumentsKotlin() throws Exception {
-        doTest("idea/testData/completion/basic/custom/NamedArgumentsKotlin.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/NamedArgumentsKotlin.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelNonImportedExtFun.kt")
     public void testTopLevelNonImportedExtFun() throws Exception {
-        doTest("idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/TopLevelNonImportedExtFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelNonImportedExtProp.kt")
     public void testTopLevelNonImportedExtProp() throws Exception {
-        doTest("idea/testData/completion/basic/custom/TopLevelNonImportedExtProp.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/TopLevelNonImportedExtProp.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelNonImportedFun.kt")
     public void testTopLevelNonImportedFun() throws Exception {
-        doTest("idea/testData/completion/basic/custom/TopLevelNonImportedFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/TopLevelNonImportedFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelNonImportedProperty.kt")
     public void testTopLevelNonImportedProperty() throws Exception {
-        doTest("idea/testData/completion/basic/custom/TopLevelNonImportedProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/custom/TopLevelNonImportedProperty.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
index 7586b421fbe..5d9669ed742 100644
--- a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,20 +29,24 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/keywords")
+@TestDataPath("$PROJECT_ROOT")
 public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest {
     @TestMetadata("AfterClassProperty.kt")
     public void testAfterClassProperty() throws Exception {
-        doTest("idea/testData/completion/keywords/AfterClassProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterClassProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterDot.kt")
     public void testAfterDot() throws Exception {
-        doTest("idea/testData/completion/keywords/AfterDot.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterDot.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterSpaceAndDot.kt")
     public void testAfterSpaceAndDot() throws Exception {
-        doTest("idea/testData/completion/keywords/AfterSpaceAndDot.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/AfterSpaceAndDot.kt");
+        doTest(fileName);
     }
     
     public void testAllFilesPresentInKeywords() throws Exception {
@@ -50,132 +55,158 @@ public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTes
     
     @TestMetadata("classObject.kt")
     public void testClassObject() throws Exception {
-        doTest("idea/testData/completion/keywords/classObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/classObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InBlockComment.kt")
     public void testInBlockComment() throws Exception {
-        doTest("idea/testData/completion/keywords/InBlockComment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InBlockComment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InChar.kt")
     public void testInChar() throws Exception {
-        doTest("idea/testData/completion/keywords/InChar.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InChar.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassBeforeFun.kt")
     public void testInClassBeforeFun() throws Exception {
-        doTest("idea/testData/completion/keywords/InClassBeforeFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InClassBeforeFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassNoCompletionInValName.kt")
     public void testInClassNoCompletionInValName() throws Exception {
-        doTest("idea/testData/completion/keywords/InClassNoCompletionInValName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InClassNoCompletionInValName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassProperty.kt")
     public void testInClassProperty() throws Exception {
-        doTest("idea/testData/completion/keywords/InClassProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InClassProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassScope.kt")
     public void testInClassScope() throws Exception {
-        doTest("idea/testData/completion/keywords/InClassScope.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InClassScope.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassTypeParameters.kt")
     public void testInClassTypeParameters() throws Exception {
-        doTest("idea/testData/completion/keywords/InClassTypeParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InClassTypeParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionName.kt")
     public void testInFunctionName() throws Exception {
-        doTest("idea/testData/completion/keywords/InFunctionName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InFunctionName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionNoCompletionInValName.kt")
     public void testInFunctionNoCompletionInValName() throws Exception {
-        doTest("idea/testData/completion/keywords/InFunctionNoCompletionInValName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InFunctionNoCompletionInValName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionScope.kt")
     public void testInFunctionScope() throws Exception {
-        doTest("idea/testData/completion/keywords/InFunctionScope.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InFunctionScope.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionTypeReference.kt")
     public void testInFunctionTypeReference() throws Exception {
-        doTest("idea/testData/completion/keywords/InFunctionTypeReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InFunctionTypeReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InMethodParametersList.kt")
     public void testInMethodParametersList() throws Exception {
-        doTest("idea/testData/completion/keywords/InMethodParametersList.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InMethodParametersList.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InModifierListInsideClass.kt")
     public void testInModifierListInsideClass() throws Exception {
-        doTest("idea/testData/completion/keywords/InModifierListInsideClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InModifierListInsideClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InNotFinishedGenericWithFunAfter.kt")
     public void testInNotFinishedGenericWithFunAfter() throws Exception {
-        doTest("idea/testData/completion/keywords/InNotFinishedGenericWithFunAfter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InNotFinishedGenericWithFunAfter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InParametersList.kt")
     public void testInParametersList() throws Exception {
-        doTest("idea/testData/completion/keywords/InParametersList.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InParametersList.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InPropertyTypeReference.kt")
     public void testInPropertyTypeReference() throws Exception {
-        doTest("idea/testData/completion/keywords/InPropertyTypeReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InPropertyTypeReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InString.kt")
     public void testInString() throws Exception {
-        doTest("idea/testData/completion/keywords/InString.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InString.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InTopNoCompletionInVarName.kt")
     public void testInTopNoCompletionInVarName() throws Exception {
-        doTest("idea/testData/completion/keywords/InTopNoCompletionInVarName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InTopNoCompletionInVarName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InTopProperty.kt")
     public void testInTopProperty() throws Exception {
-        doTest("idea/testData/completion/keywords/InTopProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InTopProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InTopScopeAfterPackage.kt")
     public void testInTopScopeAfterPackage() throws Exception {
-        doTest("idea/testData/completion/keywords/InTopScopeAfterPackage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InTopScopeAfterPackage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InTypeScope.kt")
     public void testInTypeScope() throws Exception {
-        doTest("idea/testData/completion/keywords/InTypeScope.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/InTypeScope.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LineComment.kt")
     public void testLineComment() throws Exception {
-        doTest("idea/testData/completion/keywords/LineComment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/LineComment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NoCompletionForCapitalPrefix.kt")
     public void testNoCompletionForCapitalPrefix() throws Exception {
-        doTest("idea/testData/completion/keywords/NoCompletionForCapitalPrefix.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/NoCompletionForCapitalPrefix.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertySetterGetter.kt")
     public void testPropertySetterGetter() throws Exception {
-        doTest("idea/testData/completion/keywords/PropertySetterGetter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/PropertySetterGetter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopScope.kt")
     public void testTopScope() throws Exception {
-        doTest("idea/testData/completion/keywords/TopScope.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/keywords/TopScope.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
index ab374319656..fba45058500 100644
--- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/injava")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
     public void testAllFilesPresentInInjava() throws Exception {
@@ -36,57 +38,68 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou
     
     @TestMetadata("Class.java")
     public void testClass() throws Exception {
-        doTest("idea/testData/completion/injava/Class.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Class.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassMembers.java")
     public void testClassMembers() throws Exception {
-        doTest("idea/testData/completion/injava/ClassMembers.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassMembers.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObject.java")
     public void testClassObject() throws Exception {
-        doTest("idea/testData/completion/injava/ClassObject.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassObject.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassesFromNamespace.java")
     public void testClassesFromNamespace() throws Exception {
-        doTest("idea/testData/completion/injava/ClassesFromNamespace.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ClassesFromNamespace.java");
+        doTest(fileName);
     }
     
     @TestMetadata("EnumConstants.java")
     public void testEnumConstants() throws Exception {
-        doTest("idea/testData/completion/injava/EnumConstants.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/EnumConstants.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Nested.java")
     public void testNested() throws Exception {
-        doTest("idea/testData/completion/injava/Nested.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Nested.java");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedObjectInstance.java")
     public void testNestedObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/NestedObjectInstance.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/NestedObjectInstance.java");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectInstance.java")
     public void testObjectInstance() throws Exception {
-        doTest("idea/testData/completion/injava/ObjectInstance.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/ObjectInstance.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Subpackage.java")
     public void testSubpackage() throws Exception {
-        doTest("idea/testData/completion/injava/Subpackage.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/Subpackage.java");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelMembers.java")
     public void testTopLevelMembers() throws Exception {
-        doTest("idea/testData/completion/injava/TopLevelMembers.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/TopLevelMembers.java");
+        doTest(fileName);
     }
     
     @TestMetadata("TraitMember.java")
     public void testTraitMember() throws Exception {
-        doTest("idea/testData/completion/injava/TraitMember.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/injava/TraitMember.java");
+        doTest(fileName);
     }
     
     public static Test suite() {
diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java
index f950a32c2ff..384f7edd6d4 100644
--- a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/multifile")
+@TestDataPath("$PROJECT_ROOT")
 public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest {
     public void testAllFilesPresentInMultifile() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,102 +37,122 @@ public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJ
     
     @TestMetadata("CompleteFunctionWithNoSpecifiedType")
     public void testCompleteFunctionWithNoSpecifiedType() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/CompleteFunctionWithNoSpecifiedType/");
+        doTest(fileName);
     }
     
     @TestMetadata("CompleteImportedFunction")
     public void testCompleteImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/CompleteImportedFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/CompleteImportedFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("CompletionOnImportedFunction")
     public void testCompletionOnImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/CompletionOnImportedFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/CompletionOnImportedFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("DoNotCompleteWithConstraints")
     public void testDoNotCompleteWithConstraints() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints/");
+        doTest(fileName);
     }
     
     @TestMetadata("EnumEntry")
     public void testEnumEntry() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/EnumEntry/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/EnumEntry/");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionFunction")
     public void testExtensionFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/ExtensionFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionFunctionOnImportedFunction")
     public void testExtensionFunctionOnImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/ExtensionFunctionOnImportedFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionOnNullable")
     public void testExtensionOnNullable() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionOnNullable/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/ExtensionOnNullable/");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionsForAutoCasted")
     public void testExtensionsForAutoCasted() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/ExtensionsForAutoCasted/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/ExtensionsForAutoCasted/");
+        doTest(fileName);
     }
     
     @TestMetadata("GroovyClassNameCompletionFromDefaultPackage")
     public void testGroovyClassNameCompletionFromDefaultPackage() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromDefaultPackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("GroovyClassNameCompletionFromNonDefaultPackage")
     public void testGroovyClassNameCompletionFromNonDefaultPackage() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/GroovyClassNameCompletionFromNonDefaultPackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("InImportedFunctionLiteralParameter")
     public void testInImportedFunctionLiteralParameter() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/InImportedFunctionLiteralParameter/");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaInnerClasses")
     public void testJavaInnerClasses() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/JavaInnerClasses/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/JavaInnerClasses/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedExtensionFunction")
     public void testNotImportedExtensionFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedExtensionFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedExtensionFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedExtensionProperty")
     public void testNotImportedExtensionProperty() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedExtensionProperty/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedExtensionProperty/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedFunction")
     public void testNotImportedFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedJavaClass")
     public void testNotImportedJavaClass() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedJavaClass/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedJavaClass/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedObject")
     public void testNotImportedObject() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedObject/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedObject/");
+        doTest(fileName);
     }
     
     @TestMetadata("NotImportedProperty")
     public void testNotImportedProperty() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/NotImportedProperty/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/NotImportedProperty/");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelFunction")
     public void testTopLevelFunction() throws Exception {
-        doTest("idea/testData/completion/basic/multifile/TopLevelFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/multifile/TopLevelFunction/");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
index 0a893d771fc..f4f1b9ee2f6 100644
--- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion.handlers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,25 +29,30 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/handlers/smart")
+@TestDataPath("$PROJECT_ROOT")
 public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest {
     @TestMetadata("AfterAs.kt")
     public void testAfterAs() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AfterAs.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AfterAs.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterAs2.kt")
     public void testAfterAs2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AfterAs2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AfterAs2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterAs3.kt")
     public void testAfterAs3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AfterAs3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AfterAs3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AfterSafeAs.kt")
     public void testAfterSafeAs() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AfterSafeAs.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AfterSafeAs.kt");
+        doTest(fileName);
     }
     
     public void testAllFilesPresentInSmart() throws Exception {
@@ -55,437 +61,524 @@ public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletion
     
     @TestMetadata("AnonymousObject1.kt")
     public void testAnonymousObject1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AnonymousObject1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AnonymousObject1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObject2.kt")
     public void testAnonymousObject2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AnonymousObject2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AnonymousObject2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObject3.kt")
     public void testAnonymousObject3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AnonymousObject3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AnonymousObject3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObjectInsertsImport.kt")
     public void testAnonymousObjectInsertsImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AnonymousObjectInsertsImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AnonymousObjectInsertsImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoCompleteAfterAs1.kt")
     public void testAutoCompleteAfterAs1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AutoCompleteAfterAs1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AutoCompleteAfterAs1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoCompleteAfterAs2.kt")
     public void testAutoCompleteAfterAs2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AutoCompleteAfterAs2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AutoCompleteAfterAs2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AutoCompleteAfterAs3.kt")
     public void testAutoCompleteAfterAs3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/AutoCompleteAfterAs3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/AutoCompleteAfterAs3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassInClassObject.kt")
     public void testClassInClassObject() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassInClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassInClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassInObject.kt")
     public void testClassInObject() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassInObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassInObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectFieldKeywordName.kt")
     public void testClassObjectFieldKeywordName() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassObjectFieldKeywordName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMethod1.kt")
     public void testClassObjectMethod1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassObjectMethod1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassObjectMethod1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMethod2.kt")
     public void testClassObjectMethod2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassObjectMethod2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassObjectMethod2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMethod3.kt")
     public void testClassObjectMethod3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassObjectMethod3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassObjectMethod3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObjectMethod4.kt")
     public void testClassObjectMethod4() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClassObjectMethod4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClassObjectMethod4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClosingParenthesis1.kt")
     public void testClosingParenthesis1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClosingParenthesis1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClosingParenthesis1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClosingParenthesis2.kt")
     public void testClosingParenthesis2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ClosingParenthesis2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ClosingParenthesis2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma1.kt")
     public void testComma1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma10.kt")
     public void testComma10() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma10.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma10.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma11.kt")
     public void testComma11() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma11.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma11.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma2.kt")
     public void testComma2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma3.kt")
     public void testComma3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma4.kt")
     public void testComma4() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma5.kt")
     public void testComma5() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma6.kt")
     public void testComma6() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma6.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma6.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma7.kt")
     public void testComma7() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma7.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma7.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma8.kt")
     public void testComma8() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma8.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma8.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Comma9.kt")
     public void testComma9() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Comma9.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Comma9.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("CommaInSuperConstructorCall.kt")
     public void testCommaInSuperConstructorCall() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/CommaInSuperConstructorCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/CommaInSuperConstructorCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Constructor.kt")
     public void testConstructor() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Constructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Constructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForGenericType.kt")
     public void testConstructorForGenericType() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorForGenericType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorForGenericType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForJavaClass.kt")
     public void testConstructorForJavaClass() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorForJavaClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorForJavaClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorForNullable.kt")
     public void testConstructorForNullable() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorForNullable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorForNullable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorInsertsImport.kt")
     public void testConstructorInsertsImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorInsertsImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorInsertsImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorInsertsImport2.kt")
     public void testConstructorInsertsImport2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorInsertsImport2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorInsertsImport2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorWithKeywordName.kt")
     public void testConstructorWithKeywordName() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorWithKeywordName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorWithKeywordName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorWithLambdaParameter1.kt")
     public void testConstructorWithLambdaParameter1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorWithLambdaParameter1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorWithLambdaParameter1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorWithLambdaParameter2.kt")
     public void testConstructorWithLambdaParameter2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorWithLambdaParameter2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorWithLambdaParameter2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ConstructorWithParameters.kt")
     public void testConstructorWithParameters() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ConstructorWithParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ConstructorWithParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DoNotEraseBraceOnTab.kt")
     public void testDoNotEraseBraceOnTab() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/DoNotEraseBraceOnTab.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/DoNotEraseBraceOnTab.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DoNotReplaceOnEnter.kt")
     public void testDoNotReplaceOnEnter() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/DoNotReplaceOnEnter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/DoNotReplaceOnEnter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("EnumMember.kt")
     public void testEnumMember() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/EnumMember.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/EnumMember.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference1.kt")
     public void testFunctionReference1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/FunctionReference1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/FunctionReference1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionReference2.kt")
     public void testFunctionReference2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/FunctionReference2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/FunctionReference2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GenericFunction.kt")
     public void testGenericFunction() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/GenericFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/GenericFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfCondition.kt")
     public void testIfCondition() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/IfCondition.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/IfCondition.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue1.kt")
     public void testIfValue1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/IfValue1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/IfValue1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue2.kt")
     public void testIfValue2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/IfValue2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/IfValue2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValue3.kt")
     public void testIfValue3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/IfValue3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/IfValue3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("IfValueInBlock.kt")
     public void testIfValueInBlock() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/IfValueInBlock.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/IfValueInBlock.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InElvisOperator.kt")
     public void testInElvisOperator() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/InElvisOperator.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/InElvisOperator.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaEnumMemberInsertsImport.kt")
     public void testJavaEnumMemberInsertsImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/JavaEnumMemberInsertsImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/JavaEnumMemberInsertsImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticField.kt")
     public void testJavaStaticField() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/JavaStaticField.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/JavaStaticField.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticFieldInsertImport.kt")
     public void testJavaStaticFieldInsertImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/JavaStaticFieldInsertImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/JavaStaticFieldInsertImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticMethod.kt")
     public void testJavaStaticMethod() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/JavaStaticMethod.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/JavaStaticMethod.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticMethodInsertsImport.kt")
     public void testJavaStaticMethodInsertsImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/JavaStaticMethodInsertsImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda1.kt")
     public void testLambda1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Lambda1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Lambda1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda2.kt")
     public void testLambda2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Lambda2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Lambda2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda3.kt")
     public void testLambda3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Lambda3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Lambda3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda4.kt")
     public void testLambda4() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Lambda4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Lambda4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Lambda5.kt")
     public void testLambda5() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/Lambda5.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/Lambda5.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LambdaInsertImport.kt")
     public void testLambdaInsertImport() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/LambdaInsertImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/LambdaInsertImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MergeTail1.kt")
     public void testMergeTail1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/MergeTail1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/MergeTail1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MergeTail2.kt")
     public void testMergeTail2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/MergeTail2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/MergeTail2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MergeTail3.kt")
     public void testMergeTail3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/MergeTail3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/MergeTail3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MergeTail4.kt")
     public void testMergeTail4() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/MergeTail4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/MergeTail4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableValue1.kt")
     public void testNullableValue1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/NullableValue1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/NullableValue1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableValue2.kt")
     public void testNullableValue2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/NullableValue2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/NullableValue2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableValue3.kt")
     public void testNullableValue3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/NullableValue3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/NullableValue3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableValueKeepOldArguments.kt")
     public void testNullableValueKeepOldArguments() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/NullableValueKeepOldArguments.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/NullableValueKeepOldArguments.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectFromType.kt")
     public void testObjectFromType() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/ObjectFromType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/ObjectFromType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisKeywordName1.kt")
     public void testQualifiedThisKeywordName1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/QualifiedThisKeywordName1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/QualifiedThisKeywordName1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedThisKeywordName2.kt")
     public void testQualifiedThisKeywordName2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/QualifiedThisKeywordName2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/QualifiedThisKeywordName2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SAMExpected1.kt")
     public void testSAMExpected1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/SAMExpected1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/SAMExpected1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceComma1.kt")
     public void testTabReplaceComma1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceComma1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceComma1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceComma2.kt")
     public void testTabReplaceComma2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceComma2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceComma2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceExpression.kt")
     public void testTabReplaceExpression() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceExpression.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceExpression2.kt")
     public void testTabReplaceExpression2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceExpression2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceExpression2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceExpression3.kt")
     public void testTabReplaceExpression3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceExpression3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceExpression3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceExpression4.kt")
     public void testTabReplaceExpression4() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceExpression4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceExpression4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceFunctionName1.kt")
     public void testTabReplaceFunctionName1() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceFunctionName1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceFunctionName1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceFunctionName2.kt")
     public void testTabReplaceFunctionName2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceFunctionName2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceFunctionName2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceFunctionName3.kt")
     public void testTabReplaceFunctionName3() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceFunctionName3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceFunctionName3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceIdentifier.kt")
     public void testTabReplaceIdentifier() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceIdentifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceIdentifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TabReplaceOperand.kt")
     public void testTabReplaceOperand() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/TabReplaceOperand.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/TabReplaceOperand.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("True.kt")
     public void testTrue() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/True.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/True.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("True2.kt")
     public void testTrue2() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/True2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/True2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("WhenElse.kt")
     public void testWhenElse() throws Exception {
-        doTest("idea/testData/completion/handlers/smart/WhenElse.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/handlers/smart/WhenElse.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java
index e69167dd0b7..138eb8b62f0 100644
--- a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.completion.weighers;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/weighers")
+@TestDataPath("$PROJECT_ROOT")
 public class CompletionWeigherTestGenerated extends AbstractCompletionWeigherTest {
     public void testAllFilesPresentInWeighers() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/weighers"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -35,52 +37,62 @@ public class CompletionWeigherTestGenerated extends AbstractCompletionWeigherTes
     
     @TestMetadata("DeprecatedFun.kt")
     public void testDeprecatedFun() throws Exception {
-        doTest("idea/testData/completion/weighers/DeprecatedFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/DeprecatedFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ExactMatchForKeyword.kt")
     public void testExactMatchForKeyword() throws Exception {
-        doTest("idea/testData/completion/weighers/ExactMatchForKeyword.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/ExactMatchForKeyword.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KeywordsLast.kt")
     public void testKeywordsLast() throws Exception {
-        doTest("idea/testData/completion/weighers/KeywordsLast.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/KeywordsLast.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalFileBeforeImported.kt")
     public void testLocalFileBeforeImported() throws Exception {
-        doTest("idea/testData/completion/weighers/LocalFileBeforeImported.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/LocalFileBeforeImported.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalValuesAndParams.kt")
     public void testLocalValuesAndParams() throws Exception {
-        doTest("idea/testData/completion/weighers/LocalValuesAndParams.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/LocalValuesAndParams.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalsBeforeKeywords.kt")
     public void testLocalsBeforeKeywords() throws Exception {
-        doTest("idea/testData/completion/weighers/LocalsBeforeKeywords.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/LocalsBeforeKeywords.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalsPropertiesKeywords.kt")
     public void testLocalsPropertiesKeywords() throws Exception {
-        doTest("idea/testData/completion/weighers/LocalsPropertiesKeywords.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/LocalsPropertiesKeywords.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedParameters.kt")
     public void testNamedParameters() throws Exception {
-        doTest("idea/testData/completion/weighers/NamedParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/NamedParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ParametersBeforeKeywords.kt")
     public void testParametersBeforeKeywords() throws Exception {
-        doTest("idea/testData/completion/weighers/ParametersBeforeKeywords.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/ParametersBeforeKeywords.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertiesBeforeKeywords.kt")
     public void testPropertiesBeforeKeywords() throws Exception {
-        doTest("idea/testData/completion/weighers/PropertiesBeforeKeywords.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/weighers/PropertiesBeforeKeywords.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java
index 56fb8e5a1dd..85d29224d65 100644
--- a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.editor.quickDoc;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/editor/quickDoc")
+@TestDataPath("$PROJECT_ROOT")
 public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProviderTest {
     public void testAllFilesPresentInQuickDoc() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), true);
@@ -35,62 +37,74 @@ public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProvide
     
     @TestMetadata("AtFunctionParameter.kt")
     public void testAtFunctionParameter() throws Exception {
-        doTest("idea/testData/editor/quickDoc/AtFunctionParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtFunctionParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AtTypeParameter.kt")
     public void testAtTypeParameter() throws Exception {
-        doTest("idea/testData/editor/quickDoc/AtTypeParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtTypeParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AtVariableDeclaration.kt")
     public void testAtVariableDeclaration() throws Exception {
-        doTest("idea/testData/editor/quickDoc/AtVariableDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/AtVariableDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaClassUsedInKotlin.kt")
     public void testJavaClassUsedInKotlin() throws Exception {
-        doTest("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaClassUsedInKotlin.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaMethodUsedInKotlin.kt")
     public void testJavaMethodUsedInKotlin() throws Exception {
-        doTest("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/JavaMethodUsedInKotlin.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("KotlinClassUsedFromJava.java")
     public void testKotlinClassUsedFromJava() throws Exception {
-        doTest("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinClassUsedFromJava.java");
+        doTest(fileName);
     }
     
     @TestMetadata("KotlinPackageClassUsedFromJava.java")
     public void testKotlinPackageClassUsedFromJava() throws Exception {
-        doTest("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/KotlinPackageClassUsedFromJava.java");
+        doTest(fileName);
     }
     
     @TestMetadata("MethodFromStdLib.kt")
     public void testMethodFromStdLib() throws Exception {
-        doTest("idea/testData/editor/quickDoc/MethodFromStdLib.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/MethodFromStdLib.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OnClassDeclarationWithNoPackage.kt")
     public void testOnClassDeclarationWithNoPackage() throws Exception {
-        doTest("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnClassDeclarationWithNoPackage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OnFunctionDeclarationWithPackage.kt")
     public void testOnFunctionDeclarationWithPackage() throws Exception {
-        doTest("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnFunctionDeclarationWithPackage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("OnMethodUsage.kt")
     public void testOnMethodUsage() throws Exception {
-        doTest("idea/testData/editor/quickDoc/OnMethodUsage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/OnMethodUsage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TopLevelMethodFromJava.java")
     public void testTopLevelMethodFromJava() throws Exception {
-        doTest("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/quickDoc/TopLevelMethodFromJava.java");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
index 3cc5d34d69e..d37f177fd77 100644
--- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.findUsages;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetFindUsagesTestGenerated.Kotlin.class, JetFindUsagesTestGenerated.Java.class})
 public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
     @TestMetadata("idea/testData/findUsages/kotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Kotlin.Conventions.class, Kotlin.FindClassUsages.class, Kotlin.FindFunctionUsages.class, Kotlin.FindObjectUsages.class, Kotlin.FindPackageUsages.class, Kotlin.FindParameterUsages.class, Kotlin.FindPropertyUsages.class, Kotlin.FindTypeParameterUsages.class, Kotlin.FindWithFilteringImports.class, Kotlin.FindWithStructuralGrouping.class, Kotlin.UnresolvedAnnotation.class})
     public static class Kotlin extends AbstractJetFindUsagesTest {
         public void testAllFilesPresentInKotlin() throws Exception {
@@ -37,6 +39,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/conventions")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Conventions extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInConventions() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/conventions"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -44,77 +47,92 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("compareTo.0.kt")
             public void testCompareTo() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/compareTo.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/compareTo.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentFunctions.0.kt")
             public void testComponentFunctions() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctions.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("componentFunctionsByRef.0.kt")
             public void testComponentFunctionsByRef() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/componentFunctionsByRef.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("contains.0.kt")
             public void testContains() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/contains.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/contains.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("equals.0.kt")
             public void testEquals() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/equals.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/equals.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("forIteration.0.kt")
             public void testForIteration() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/forIteration.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/forIteration.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("get.0.kt")
             public void testGet() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/get.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/get.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("identityEquals.0.kt")
             public void testIdentityEquals() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/identityEquals.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inc.0.kt")
             public void testInc() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/inc.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/inc.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invoke.0.kt")
             public void testInvoke() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/invoke.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/invoke.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plus.0.kt")
             public void testPlus() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/plus.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plus.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plusAssign.0.kt")
             public void testPlusAssign() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/plusAssign.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("set.0.kt")
             public void testSet() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/set.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/set.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unaryMinus.0.kt")
             public void testUnaryMinus() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/conventions/unaryMinus.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findClassUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindClassUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindClassUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -122,247 +140,296 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("javaClassAllUsages.0.kt")
             public void testJavaClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassAllUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassConstructorUsages.0.kt")
             public void testJavaClassConstructorUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassConstructorUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassFunctionUsages1.0.kt")
             public void testJavaClassFunctionUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassFunctionUsages2.0.kt")
             public void testJavaClassFunctionUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassFunctionUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassNonConstructorUsages.0.kt")
             public void testJavaClassNonConstructorUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassNonConstructorUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassPropertyUsages1.0.kt")
             public void testJavaClassPropertyUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassPropertyUsages2.0.kt")
             public void testJavaClassPropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaClassPropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaDerivedClassUsages1.0.kt")
             public void testJavaDerivedClassUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaDerivedClassUsages2.0.kt")
             public void testJavaDerivedClassUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedClassUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaDerivedInterfaceUsages1.0.kt")
             public void testJavaDerivedInterfaceUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaDerivedInterfaceUsages2.0.kt")
             public void testJavaDerivedInterfaceUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/javaDerivedInterfaceUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassAllUsages.0.kt")
             public void testKotlinClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassAllUsages2.0.kt")
             public void testKotlinClassAllUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassAllUsages3.0.kt")
             public void testKotlinClassAllUsages3() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsages3.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassAllUsagesNoImport.0.kt")
             public void testKotlinClassAllUsagesNoImport() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassAllUsagesNoImport.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassConstructorUsages.0.kt")
             public void testKotlinClassConstructorUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassConstructorUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedAnonymousObjects.0.kt")
             public void testKotlinClassDerivedAnonymousObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedAnonymousObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedClasses.0.kt")
             public void testKotlinClassDerivedClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedInnerClasses.0.kt")
             public void testKotlinClassDerivedInnerClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedInnerObjects.0.kt")
             public void testKotlinClassDerivedInnerObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedInnerObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedLocalClasses.0.kt")
             public void testKotlinClassDerivedLocalClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedLocalObjects.0.kt")
             public void testKotlinClassDerivedLocalObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedLocalTraits.0.kt")
             public void testKotlinClassDerivedLocalTraits() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedLocalTraits.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedObjects.0.kt")
             public void testKotlinClassDerivedObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassDerivedTraits.0.kt")
             public void testKotlinClassDerivedTraits() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassDerivedTraits.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassFunctionUsages1.0.kt")
             public void testKotlinClassFunctionUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassFunctionUsages2.0.kt")
             public void testKotlinClassFunctionUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassFunctionUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassNonConstructorUsages.0.kt")
             public void testKotlinClassNonConstructorUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassNonConstructorUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassPropertyUsages1.0.kt")
             public void testKotlinClassPropertyUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinClassPropertyUsages2.0.kt")
             public void testKotlinClassPropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinClassPropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinInnerClassAllUsages.0.kt")
             public void testKotlinInnerClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinInnerClassAllUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassDerivedAnonymousObjects.0.kt")
             public void testKotlinLocalClassDerivedAnonymousObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedAnonymousObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassDerivedLocalClasses.0.kt")
             public void testKotlinLocalClassDerivedLocalClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassDerivedLocalObjects.0.kt")
             public void testKotlinLocalClassDerivedLocalObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassDerivedLocalTraits.0.kt")
             public void testKotlinLocalClassDerivedLocalTraits() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassDerivedLocalTraits.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassUsages1.0.kt")
             public void testKotlinLocalClassUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalClassUsages2.0.kt")
             public void testKotlinLocalClassUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinLocalClassUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinNestedClassAllUsages.0.kt")
             public void testKotlinNestedClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinNestedClassAllUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPrivateClassUsages.0.kt")
             public void testKotlinPrivateClassUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinPrivateClassUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedAnonymousObjects.0.kt")
             public void testKotlinTraitDerivedAnonymousObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedAnonymousObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedClasses.0.kt")
             public void testKotlinTraitDerivedClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedInnerClasses.0.kt")
             public void testKotlinTraitDerivedInnerClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedInnerObjects.0.kt")
             public void testKotlinTraitDerivedInnerObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedInnerObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedLocalClasses.0.kt")
             public void testKotlinTraitDerivedLocalClasses() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalClasses.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedLocalObjects.0.kt")
             public void testKotlinTraitDerivedLocalObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedLocalTraits.0.kt")
             public void testKotlinTraitDerivedLocalTraits() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedLocalTraits.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedObjects.0.kt")
             public void testKotlinTraitDerivedObjects() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedObjects.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTraitDerivedTraits.0.kt")
             public void testKotlinTraitDerivedTraits() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findClassUsages/kotlinTraitDerivedTraits.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindFunctionUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindFunctionUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findFunctionUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -370,67 +437,80 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("javaAndKotlinOverrides.0.kt")
             public void testJavaAndKotlinOverrides() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaAndKotlinOverrides.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaMethodUsages.0.kt")
             public void testJavaMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/javaMethodUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalMethodUsages1.0.kt")
             public void testKotlinLocalMethodUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalMethodUsages2.0.kt")
             public void testKotlinLocalMethodUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinLocalMethodUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinMethodUsages.0.kt")
             public void testKotlinMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinMethodUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinOverloadAndExtensionUsages.0.kt")
             public void testKotlinOverloadAndExtensionUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinOverloadAndExtensionUsages2.0.kt")
             public void testKotlinOverloadAndExtensionUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinOverloadAndExtensionUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPrivateMethodUsages.0.kt")
             public void testKotlinPrivateMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinPrivateMethodUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTopLevelMethodUsages.0.kt")
             public void testKotlinTopLevelMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTopLevelMethodUsagesNoImport.0.kt")
             public void testKotlinTopLevelMethodUsagesNoImport() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsagesNoImport.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("synthesizedFunction.0.kt")
             public void testSynthesizedFunction() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/synthesizedFunction.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usagesOfBaseForFunction.0.kt")
             public void testUsagesOfBaseForFunction() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findFunctionUsages/usagesOfBaseForFunction.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findObjectUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindObjectUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindObjectUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -438,37 +518,44 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("javaObjectUsages.0.kt")
             public void testJavaObjectUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/javaObjectUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalObjectUsages1.0.kt")
             public void testKotlinLocalObjectUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalObjectUsages2.0.kt")
             public void testKotlinLocalObjectUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinLocalObjectUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinNestedObjectUsages.0.kt")
             public void testKotlinNestedObjectUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinNestedObjectUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinObjectUsages.0.kt")
             public void testKotlinObjectUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinObjectUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPrivateObjectUsages.0.kt")
             public void testKotlinPrivateObjectUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findObjectUsages/kotlinPrivateObjectUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findPackageUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindPackageUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindPackageUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPackageUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -476,12 +563,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("kotlinPackageUsages.0.kt")
             public void testKotlinPackageUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPackageUsages/kotlinPackageUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findParameterUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindParameterUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindParameterUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -489,17 +578,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("kotlinConstructorParameterUsages.0.kt")
             public void testKotlinConstructorParameterUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinConstructorParameterUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinFunctionParameterUsages.0.kt")
             public void testKotlinFunctionParameterUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findParameterUsages/kotlinFunctionParameterUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findPropertyUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindPropertyUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindPropertyUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -507,107 +599,128 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("javaAndKotlinOverrides.0.kt")
             public void testJavaAndKotlinOverrides() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaAndKotlinOverrides2.0.kt")
             public void testJavaAndKotlinOverrides2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaAndKotlinOverrides2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaClassObjectPropertyUsages.0.kt")
             public void testJavaClassObjectPropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaClassObjectPropertyUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyReadUsages.0.kt")
             public void testJavaPropertyReadUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyReadUsages2.0.kt")
             public void testJavaPropertyReadUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyReadUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyUsages.0.kt")
             public void testJavaPropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyUsages2.0.kt")
             public void testJavaPropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyWriteUsages.0.kt")
             public void testJavaPropertyWriteUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("javaPropertyWriteUsages2.0.kt")
             public void testJavaPropertyWriteUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/javaPropertyWriteUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalPropertyUsages1.0.kt")
             public void testKotlinLocalPropertyUsages1() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages1.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinLocalPropertyUsages2.0.kt")
             public void testKotlinLocalPropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinLocalPropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPrivatePropertyUsages.0.kt")
             public void testKotlinPrivatePropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPrivatePropertyUsages2.0.kt")
             public void testKotlinPrivatePropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPrivatePropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyReadUsages.0.kt")
             public void testKotlinPropertyReadUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyReadUsages2.0.kt")
             public void testKotlinPropertyReadUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyReadUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyUsages.0.kt")
             public void testKotlinPropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyUsages2.0.kt")
             public void testKotlinPropertyUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyWriteUsages.0.kt")
             public void testKotlinPropertyWriteUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyWriteUsages2.0.kt")
             public void testKotlinPropertyWriteUsages2() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinPropertyWriteUsages2.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinTopLevelPropertyUsages.0.kt")
             public void testKotlinTopLevelPropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindTypeParameterUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindTypeParameterUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -615,17 +728,20 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("kotlinClassTypeParameterUsages.0.kt")
             public void testKotlinClassTypeParameterUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinClassTypeParameterUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinFunctionTypeParameterUsages.0.kt")
             public void testKotlinFunctionTypeParameterUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages/kotlinFunctionTypeParameterUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindWithFilteringImports extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindWithFilteringImports() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -633,12 +749,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("findWithFilteringImports.0.kt")
             public void testFindWithFilteringImports() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindWithStructuralGrouping extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindWithStructuralGrouping() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithStructuralGrouping"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -646,22 +764,26 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("kotlinClassAllUsages.0.kt")
             public void testKotlinClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinMethodUsages.0.kt")
             public void testKotlinMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("kotlinPropertyUsages.0.kt")
             public void testKotlinPropertyUsages() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation")
+        @TestDataPath("$PROJECT_ROOT")
         public static class UnresolvedAnnotation extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInUnresolvedAnnotation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true);
@@ -669,7 +791,8 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("unresolvedAnnotation.0.kt")
             public void testUnresolvedAnnotation() throws Exception {
-                doTest("idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation/unresolvedAnnotation.0.kt");
+                doTest(fileName);
             }
             
         }
@@ -693,6 +816,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
     }
     
     @TestMetadata("idea/testData/findUsages/java")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Java.FindJavaClassUsages.class, Java.FindJavaFieldUsages.class, Java.FindJavaMethodUsages.class})
     public static class Java extends AbstractJetFindUsagesTest {
         public void testAllFilesPresentInJava() throws Exception {
@@ -700,6 +824,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
         }
         
         @TestMetadata("idea/testData/findUsages/java/findJavaClassUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindJavaClassUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaClassUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaClassUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -707,117 +832,140 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("JKClassAllUsages.0.java")
             public void testJKClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassAllUsages.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedAnonymousObjects.0.java")
             public void testJKClassDerivedAnonymousObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedAnonymousObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedClasses.0.java")
             public void testJKClassDerivedClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedInnerClasses.0.java")
             public void testJKClassDerivedInnerClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedInnerObjects.0.java")
             public void testJKClassDerivedInnerObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedInnerObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedLocalClasses.0.java")
             public void testJKClassDerivedLocalClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedLocalObjects.0.java")
             public void testJKClassDerivedLocalObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedLocalObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassDerivedObjects.0.java")
             public void testJKClassDerivedObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassDerivedObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassFieldsUsages.0.java")
             public void testJKClassFieldsUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassFieldsUsages.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassMethodsUsages.0.java")
             public void testJKClassMethodsUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassMethodsUsages.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKClassWithImplicitConstructorAllUsages.0.java")
             public void testJKClassWithImplicitConstructorAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKClassWithImplicitConstructorAllUsages.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKDerivedInterfaces.0.java")
             public void testJKDerivedInterfaces() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKDerivedInterfaces.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInnerClassAllUsages.0.java")
             public void testJKInnerClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInnerClassAllUsages.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedAnonymousObjects.0.java")
             public void testJKInterfaceDerivedAnonymousObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedAnonymousObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedClasses.0.java")
             public void testJKInterfaceDerivedClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedInnerClasses.0.java")
             public void testJKInterfaceDerivedInnerClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedInnerObjects.0.java")
             public void testJKInterfaceDerivedInnerObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedInnerObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedLocalClasses.0.java")
             public void testJKInterfaceDerivedLocalClasses() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalClasses.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedLocalObjects.0.java")
             public void testJKInterfaceDerivedLocalObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedLocalTraits.0.java")
             public void testJKInterfaceDerivedLocalTraits() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedLocalTraits.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKInterfaceDerivedObjects.0.java")
             public void testJKInterfaceDerivedObjects() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKInterfaceDerivedObjects.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKNestedClassAllUsages.0.java")
             public void testJKNestedClassAllUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaClassUsages/JKNestedClassAllUsages.0.java");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/java/findJavaFieldUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindJavaFieldUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaFieldUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaFieldUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -825,12 +973,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("JKFieldUsages.0.java")
             public void testJKFieldUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaFieldUsages/JKFieldUsages.0.java");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/findUsages/java/findJavaMethodUsages")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FindJavaMethodUsages extends AbstractJetFindUsagesTest {
             public void testAllFilesPresentInFindJavaMethodUsages() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaMethodUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true);
@@ -838,12 +988,14 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
             
             @TestMetadata("JKMethodOverrides.0.java")
             public void testJKMethodOverrides() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodOverrides.0.java");
+                doTest(fileName);
             }
             
             @TestMetadata("JKMethodUsages.0.java")
             public void testJKMethodUsages() throws Exception {
-                doTest("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/findUsages/java/findJavaMethodUsages/JKMethodUsages.0.java");
+                doTest(fileName);
             }
             
         }
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
index b521c3da63f..2b69fba19a2 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.formatter;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetFormatterTestGenerated.Formatter.class, JetFormatterTestGenerated.FormatterInverted.class})
 public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
     @TestMetadata("idea/testData/formatter")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Formatter.ModifierList.class})
     public static class Formatter extends AbstractJetFormatterTest {
         public void testAllFilesPresentInFormatter() throws Exception {
@@ -38,340 +40,408 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         
         @TestMetadata("ArrayAccess.after.kt")
         public void testArrayAccess() throws Exception {
-            doTest("idea/testData/formatter/ArrayAccess.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ArrayAccess.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryExpressionAlignmentSpread.after.kt")
         public void testBinaryExpressionAlignmentSpread() throws Exception {
-            doTest("idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionAlignmentSpread.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryExpressions.after.kt")
         public void testBinaryExpressions() throws Exception {
-            doTest("idea/testData/formatter/BinaryExpressions.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryExpressionsBoolean.after.kt")
         public void testBinaryExpressionsBoolean() throws Exception {
-            doTest("idea/testData/formatter/BinaryExpressionsBoolean.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryExpressionsWithoutAlignment.after.kt")
         public void testBinaryExpressionsWithoutAlignment() throws Exception {
-            doTest("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BlockFor.after.kt")
         public void testBlockFor() throws Exception {
-            doTest("idea/testData/formatter/BlockFor.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BlockFor.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CatchFinallyOnNewLine.after.kt")
         public void testCatchFinallyOnNewLine() throws Exception {
-            doTest("idea/testData/formatter/CatchFinallyOnNewLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Class.after.kt")
         public void testClass() throws Exception {
-            doTest("idea/testData/formatter/Class.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Class.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassLineBreak.after.kt")
         public void testClassLineBreak() throws Exception {
-            doTest("idea/testData/formatter/ClassLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ColonSpaces.after.kt")
         public void testColonSpaces() throws Exception {
-            doTest("idea/testData/formatter/ColonSpaces.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CommentInFunctionLiteral.after.kt")
         public void testCommentInFunctionLiteral() throws Exception {
-            doTest("idea/testData/formatter/CommentInFunctionLiteral.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CommentInFunctionLiteral.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConsecutiveCalls.after.kt")
         public void testConsecutiveCalls() throws Exception {
-            doTest("idea/testData/formatter/ConsecutiveCalls.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveCalls.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConsecutiveSafeCallsIndent.after.kt")
         public void testConsecutiveSafeCallsIndent() throws Exception {
-            doTest("idea/testData/formatter/ConsecutiveSafeCallsIndent.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ConsecutiveSafeCallsIndent.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DelegationList.after.kt")
         public void testDelegationList() throws Exception {
-            doTest("idea/testData/formatter/DelegationList.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoWhileLineBreak.after.kt")
         public void testDoWhileLineBreak() throws Exception {
-            doTest("idea/testData/formatter/DoWhileLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DoWhileSpacing.after.kt")
         public void testDoWhileSpacing() throws Exception {
-            doTest("idea/testData/formatter/DoWhileSpacing.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileSpacing.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ElseOnNewLine.after.kt")
         public void testElseOnNewLine() throws Exception {
-            doTest("idea/testData/formatter/ElseOnNewLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Elvis.after.kt")
         public void testElvis() throws Exception {
-            doTest("idea/testData/formatter/Elvis.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EmptyLineAfterPackage.after.kt")
         public void testEmptyLineAfterPackage() throws Exception {
-            doTest("idea/testData/formatter/EmptyLineAfterPackage.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyLineAfterPackage.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ForLineBreak.after.kt")
         public void testForLineBreak() throws Exception {
-            doTest("idea/testData/formatter/ForLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ForNoBraces.after.kt")
         public void testForNoBraces() throws Exception {
-            doTest("idea/testData/formatter/ForNoBraces.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForNoBraces.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ForSpacing.after.kt")
         public void testForSpacing() throws Exception {
-            doTest("idea/testData/formatter/ForSpacing.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForSpacing.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionCallParametersAlign.after.kt")
         public void testFunctionCallParametersAlign() throws Exception {
-            doTest("idea/testData/formatter/FunctionCallParametersAlign.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionCallParametersAlign.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionDefParametersAlign.after.kt")
         public void testFunctionDefParametersAlign() throws Exception {
-            doTest("idea/testData/formatter/FunctionDefParametersAlign.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionDefParametersAlign.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionLineBreak.after.kt")
         public void testFunctionLineBreak() throws Exception {
-            doTest("idea/testData/formatter/FunctionLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionLiteralsInChainCalls.after.kt")
         public void testFunctionLiteralsInChainCalls() throws Exception {
-            doTest("idea/testData/formatter/FunctionLiteralsInChainCalls.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLiteralsInChainCalls.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionWithInference.after.kt")
         public void testFunctionWithInference() throws Exception {
-            doTest("idea/testData/formatter/FunctionWithInference.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionWithInference.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionalType.after.kt")
         public void testFunctionalType() throws Exception {
-            doTest("idea/testData/formatter/FunctionalType.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GetterAndSetter.after.kt")
         public void testGetterAndSetter() throws Exception {
-            doTest("idea/testData/formatter/GetterAndSetter.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/GetterAndSetter.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("If.after.kt")
         public void testIf() throws Exception {
-            doTest("idea/testData/formatter/If.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/If.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfElseRemoveLineBreak.after.kt")
         public void testIfElseRemoveLineBreak() throws Exception {
-            doTest("idea/testData/formatter/IfElseRemoveLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseRemoveLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfElseWithLineBreak.after.kt")
         public void testIfElseWithLineBreak() throws Exception {
-            doTest("idea/testData/formatter/IfElseWithLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfElseWithTrickyComments.after.kt")
         public void testIfElseWithTrickyComments() throws Exception {
-            doTest("idea/testData/formatter/IfElseWithTrickyComments.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfSpacing.after.kt")
         public void testIfSpacing() throws Exception {
-            doTest("idea/testData/formatter/IfSpacing.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfSpacing.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("KDoc.after.kt")
         public void testKDoc() throws Exception {
-            doTest("idea/testData/formatter/KDoc.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/KDoc.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LambdaArrow.after.kt")
         public void testLambdaArrow() throws Exception {
-            doTest("idea/testData/formatter/LambdaArrow.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LoopParameterWithExplicitType.after.kt")
         public void testLoopParameterWithExplicitType() throws Exception {
-            doTest("idea/testData/formatter/LoopParameterWithExplicitType.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LoopParameterWithExplicitType.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Multideclaration.after.kt")
         public void testMultideclaration() throws Exception {
-            doTest("idea/testData/formatter/Multideclaration.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Multideclaration.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MultilineFunctionLiteral.after.kt")
         public void testMultilineFunctionLiteral() throws Exception {
-            doTest("idea/testData/formatter/MultilineFunctionLiteral.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteral.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MultilineFunctionLiteralWithParams.after.kt")
         public void testMultilineFunctionLiteralWithParams() throws Exception {
-            doTest("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Parameters.after.kt")
         public void testParameters() throws Exception {
-            doTest("idea/testData/formatter/Parameters.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyWithInference.after.kt")
         public void testPropertyWithInference() throws Exception {
-            doTest("idea/testData/formatter/PropertyWithInference.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/PropertyWithInference.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ReferenceExpressionFunctionLiteral.after.kt")
         public void testReferenceExpressionFunctionLiteral() throws Exception {
-            doTest("idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ReferenceExpressionFunctionLiteral.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RemoveSpacesAroundOperations.after.kt")
         public void testRemoveSpacesAroundOperations() throws Exception {
-            doTest("idea/testData/formatter/RemoveSpacesAroundOperations.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RemoveSpacesAroundOperations.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ReturnExpression.after.kt")
         public void testReturnExpression() throws Exception {
-            doTest("idea/testData/formatter/ReturnExpression.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ReturnExpression.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RightBracketOnNewLine.after.kt")
         public void testRightBracketOnNewLine() throws Exception {
-            doTest("idea/testData/formatter/RightBracketOnNewLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SaveSpacesInDocComments.after.kt")
         public void testSaveSpacesInDocComments() throws Exception {
-            doTest("idea/testData/formatter/SaveSpacesInDocComments.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SaveSpacesInDocComments.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Script.after.kts")
         public void testScript() throws Exception {
-            doTest("idea/testData/formatter/Script.after.kts");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Script.after.kts");
+            doTest(fileName);
         }
         
         @TestMetadata("SingleLineFunctionLiteral.after.kt")
         public void testSingleLineFunctionLiteral() throws Exception {
-            doTest("idea/testData/formatter/SingleLineFunctionLiteral.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColon.after.kt")
         public void testSpaceAroundExtendColon() throws Exception {
-            doTest("idea/testData/formatter/SpaceAroundExtendColon.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColonInEnums.after.kt")
         public void testSpaceAroundExtendColonInEnums() throws Exception {
-            doTest("idea/testData/formatter/SpaceAroundExtendColonInEnums.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInEnums.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColonInObjects.after.kt")
         public void testSpaceAroundExtendColonInObjects() throws Exception {
-            doTest("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpaceBeforeFunctionLiteral.after.kt")
         public void testSpaceBeforeFunctionLiteral() throws Exception {
-            doTest("idea/testData/formatter/SpaceBeforeFunctionLiteral.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceBeforeFunctionLiteral.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpacesAroundOperations.after.kt")
         public void testSpacesAroundOperations() throws Exception {
-            doTest("idea/testData/formatter/SpacesAroundOperations.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpacesAroundUnaryOperations.after.kt")
         public void testSpacesAroundUnaryOperations() throws Exception {
-            doTest("idea/testData/formatter/SpacesAroundUnaryOperations.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpacesInDeclarations.after.kt")
         public void testSpacesInDeclarations() throws Exception {
-            doTest("idea/testData/formatter/SpacesInDeclarations.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesInDeclarations.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SpacesInQualifiedExpressions.after.kt")
         public void testSpacesInQualifiedExpressions() throws Exception {
-            doTest("idea/testData/formatter/SpacesInQualifiedExpressions.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesInQualifiedExpressions.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TryCatchLineBreak.after.kt")
         public void testTryCatchLineBreak() throws Exception {
-            doTest("idea/testData/formatter/TryCatchLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnnecessarySpacesInParametersLists.after.kt")
         public void testUnnecessarySpacesInParametersLists() throws Exception {
-            doTest("idea/testData/formatter/UnnecessarySpacesInParametersLists.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/UnnecessarySpacesInParametersLists.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("When.after.kt")
         public void testWhen() throws Exception {
-            doTest("idea/testData/formatter/When.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/When.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhenArrow.after.kt")
         public void testWhenArrow() throws Exception {
-            doTest("idea/testData/formatter/WhenArrow.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhenEntryExpr.after.kt")
         public void testWhenEntryExpr() throws Exception {
-            doTest("idea/testData/formatter/WhenEntryExpr.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenEntryExpr.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhenLineBreak.after.kt")
         public void testWhenLineBreak() throws Exception {
-            doTest("idea/testData/formatter/WhenLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhenLinesBeforeLbrace.after.kt")
         public void testWhenLinesBeforeLbrace() throws Exception {
-            doTest("idea/testData/formatter/WhenLinesBeforeLbrace.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLinesBeforeLbrace.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhileLineBreak.after.kt")
         public void testWhileLineBreak() throws Exception {
-            doTest("idea/testData/formatter/WhileLineBreak.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhileOnNewLine.after.kt")
         public void testWhileOnNewLine() throws Exception {
-            doTest("idea/testData/formatter/WhileOnNewLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WhileSpacing.after.kt")
         public void testWhileSpacing() throws Exception {
-            doTest("idea/testData/formatter/WhileSpacing.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileSpacing.after.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/formatter/modifierList")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ModifierList extends AbstractJetFormatterTest {
             public void testAllFilesPresentInModifierList() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
@@ -379,82 +449,98 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
             
             @TestMetadata("funAnnotationBeforeAnnotation.after.kt")
             public void testFunAnnotationBeforeAnnotation() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotation.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funAnnotationBeforeAnnotationEntry.after.kt")
             public void testFunAnnotationBeforeAnnotationEntry() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotationEntry.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeAnnotationEntry.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funAnnotationBeforeModifiers.after.kt")
             public void testFunAnnotationBeforeModifiers() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationBeforeModifiers.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationBeforeModifiers.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funAnnotationEntryBeforeAnnotation.after.kt")
             public void testFunAnnotationEntryBeforeAnnotation() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotation.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funAnnotationEntryBeforeAnnotationEntry.after.kt")
             public void testFunAnnotationEntryBeforeAnnotationEntry() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotationEntry.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeAnnotationEntry.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funAnnotationEntryBeforeModifiers.after.kt")
             public void testFunAnnotationEntryBeforeModifiers() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funAnnotationEntryBeforeModifiers.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funAnnotationEntryBeforeModifiers.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funModifierBeforeAnnotation.after.kt")
             public void testFunModifierBeforeAnnotation() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotation.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funModifierBeforeAnnotationEntry.after.kt")
             public void testFunModifierBeforeAnnotationEntry() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funModifierBeforeAnnotationEntry.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeAnnotationEntry.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funModifierBeforeModifiers.after.kt")
             public void testFunModifierBeforeModifiers() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funModifierBeforeModifiers.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funModifierBeforeModifiers.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funTheOnlyModifier.after.kt")
             public void testFunTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/funTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/funTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberFunTheOnlyModifier.after.kt")
             public void testMemberFunTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/memberFunTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberFunTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberValTheOnlyModifier.after.kt")
             public void testMemberValTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/memberValTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberValTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("memberVarTheOnlyModifier.after.kt")
             public void testMemberVarTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/memberVarTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/memberVarTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("secondMemberFunTheOnlyModifier.after.kt")
             public void testSecondMemberFunTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberFunTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("secondMemberValTheOnlyModifier.after.kt")
             public void testSecondMemberValTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberValTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("secondMemberVarTheOnlyModifier.after.kt")
             public void testSecondMemberVarTheOnlyModifier() throws Exception {
-                doTest("idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/modifierList/secondMemberVarTheOnlyModifier.after.kt");
+                doTest(fileName);
             }
             
         }
@@ -468,6 +554,7 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
     }
     
     @TestMetadata("idea/testData/formatter")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class FormatterInverted extends AbstractJetFormatterTest {
         public void testAllFilesPresentInFormatterInverted() throws Exception {
@@ -476,157 +563,188 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
         
         @TestMetadata("BinaryExpressions.after.inv.kt")
         public void testBinaryExpressions() throws Exception {
-            doTestInverted("idea/testData/formatter/BinaryExpressions.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressions.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("BinaryExpressionsBoolean.after.inv.kt")
         public void testBinaryExpressionsBoolean() throws Exception {
-            doTestInverted("idea/testData/formatter/BinaryExpressionsBoolean.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsBoolean.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("BinaryExpressionsWithoutAlignment.after.inv.kt")
         public void testBinaryExpressionsWithoutAlignment() throws Exception {
-            doTestInverted("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/BinaryExpressionsWithoutAlignment.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("CatchFinallyOnNewLine.after.inv.kt")
         public void testCatchFinallyOnNewLine() throws Exception {
-            doTestInverted("idea/testData/formatter/CatchFinallyOnNewLine.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/CatchFinallyOnNewLine.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("ClassLineBreak.after.inv.kt")
         public void testClassLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/ClassLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ClassLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("ColonSpaces.after.inv.kt")
         public void testColonSpaces() throws Exception {
-            doTestInverted("idea/testData/formatter/ColonSpaces.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ColonSpaces.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("DelegationList.after.inv.kt")
         public void testDelegationList() throws Exception {
-            doTestInverted("idea/testData/formatter/DelegationList.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DelegationList.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("DoWhileLineBreak.after.inv.kt")
         public void testDoWhileLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/DoWhileLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/DoWhileLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("ElseOnNewLine.after.inv.kt")
         public void testElseOnNewLine() throws Exception {
-            doTestInverted("idea/testData/formatter/ElseOnNewLine.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ElseOnNewLine.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("Elvis.after.inv.kt")
         public void testElvis() throws Exception {
-            doTestInverted("idea/testData/formatter/Elvis.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Elvis.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("EmptyBlocks.after.inv.kt")
         public void testEmptyBlocks() throws Exception {
-            doTestInverted("idea/testData/formatter/EmptyBlocks.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/EmptyBlocks.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("ForLineBreak.after.inv.kt")
         public void testForLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/ForLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/ForLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("FunctionLineBreak.after.inv.kt")
         public void testFunctionLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/FunctionLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("FunctionalType.after.inv.kt")
         public void testFunctionalType() throws Exception {
-            doTestInverted("idea/testData/formatter/FunctionalType.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/FunctionalType.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("IfElseWithTrickyComments.after.inv.kt")
         public void testIfElseWithTrickyComments() throws Exception {
-            doTestInverted("idea/testData/formatter/IfElseWithTrickyComments.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/IfElseWithTrickyComments.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("LambdaArrow.after.inv.kt")
         public void testLambdaArrow() throws Exception {
-            doTestInverted("idea/testData/formatter/LambdaArrow.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/LambdaArrow.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("MultilineFunctionLiteralWithParams.after.inv.kt")
         public void testMultilineFunctionLiteralWithParams() throws Exception {
-            doTestInverted("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/MultilineFunctionLiteralWithParams.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("Parameters.after.inv.kt")
         public void testParameters() throws Exception {
-            doTestInverted("idea/testData/formatter/Parameters.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/Parameters.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("RightBracketOnNewLine.after.inv.kt")
         public void testRightBracketOnNewLine() throws Exception {
-            doTestInverted("idea/testData/formatter/RightBracketOnNewLine.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/RightBracketOnNewLine.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SingleLineFunctionLiteral.after.inv.kt")
         public void testSingleLineFunctionLiteral() throws Exception {
-            doTestInverted("idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColon.after.inv.kt")
         public void testSpaceAroundExtendColon() throws Exception {
-            doTestInverted("idea/testData/formatter/SpaceAroundExtendColon.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColon.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColonInEnums.after.inv.kt")
         public void testSpaceAroundExtendColonInEnums() throws Exception {
-            doTestInverted("idea/testData/formatter/SpaceAroundExtendColonInEnums.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInEnums.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SpaceAroundExtendColonInObjects.after.inv.kt")
         public void testSpaceAroundExtendColonInObjects() throws Exception {
-            doTestInverted("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SpacesAroundOperations.after.inv.kt")
         public void testSpacesAroundOperations() throws Exception {
-            doTestInverted("idea/testData/formatter/SpacesAroundOperations.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundOperations.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("SpacesAroundUnaryOperations.after.inv.kt")
         public void testSpacesAroundUnaryOperations() throws Exception {
-            doTestInverted("idea/testData/formatter/SpacesAroundUnaryOperations.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/SpacesAroundUnaryOperations.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("TryCatchLineBreak.after.inv.kt")
         public void testTryCatchLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/TryCatchLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/TryCatchLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("When.after.inv.kt")
         public void testWhen() throws Exception {
-            doTestInverted("idea/testData/formatter/When.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/When.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("WhenArrow.after.inv.kt")
         public void testWhenArrow() throws Exception {
-            doTestInverted("idea/testData/formatter/WhenArrow.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenArrow.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("WhenLineBreak.after.inv.kt")
         public void testWhenLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/WhenLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhenLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("WhileLineBreak.after.inv.kt")
         public void testWhileLineBreak() throws Exception {
-            doTestInverted("idea/testData/formatter/WhileLineBreak.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileLineBreak.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         @TestMetadata("WhileOnNewLine.after.inv.kt")
         public void testWhileOnNewLine() throws Exception {
-            doTestInverted("idea/testData/formatter/WhileOnNewLine.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.inv.kt");
+            doTestInverted(fileName);
         }
         
         public static Test innerSuite() {
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java
index 2f905fcdba7..09ae63f2b65 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.formatter;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,31 +31,37 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetTypingIndentationTestBaseGenerated.DirectSettings.class, JetTypingIndentationTestBaseGenerated.InvertedSettings.class})
 public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingIndentationTestBase {
     @TestMetadata("idea/testData/indentationOnNewline")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DirectSettings.Script.class})
     public static class DirectSettings extends AbstractJetTypingIndentationTestBase {
         @TestMetadata("AfterCatch.after.kt")
         public void testAfterCatch() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AfterCatch.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterCatch.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("AfterClassNameBeforeFun.after.kt")
         public void testAfterClassNameBeforeFun() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("AfterFinally.after.kt")
         public void testAfterFinally() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AfterFinally.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterFinally.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("AfterImport.after.kt")
         public void testAfterImport() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AfterImport.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterImport.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("AfterTry.after.kt")
         public void testAfterTry() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AfterTry.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AfterTry.after.kt");
+            doNewlineTest(fileName);
         }
         
         public void testAllFilesPresentInDirectSettings() throws Exception {
@@ -63,195 +70,234 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
         
         @TestMetadata("AssignmentAfterEq.after.kt")
         public void testAssignmentAfterEq() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("BinaryWithTypeExpressions.after.kt")
         public void testBinaryWithTypeExpressions() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("ConsecutiveCallsAfterDot.after.kt")
         public void testConsecutiveCallsAfterDot() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("ConsecutiveCallsInSaeCallsMiddle.after.kt")
         public void testConsecutiveCallsInSaeCallsMiddle() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("ConsecutiveCallsInSafeCallsEnd.after.kt")
         public void testConsecutiveCallsInSafeCallsEnd() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("DoInFun.after.kt")
         public void testDoInFun() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/DoInFun.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/DoInFun.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("EmptyParameters.after.kt")
         public void testEmptyParameters() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/EmptyParameters.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/EmptyParameters.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("For.after.kt")
         public void testFor() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/For.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/For.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("FunctionBlock.after.kt")
         public void testFunctionBlock() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/FunctionBlock.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/FunctionBlock.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("FunctionWithInference.after.kt")
         public void testFunctionWithInference() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/FunctionWithInference.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/FunctionWithInference.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("If.after.kt")
         public void testIf() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/If.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/If.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InBinaryExpressionInMiddle.after.kt")
         public void testInBinaryExpressionInMiddle() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InBinaryExpressionUnfinished.after.kt")
         public void testInBinaryExpressionUnfinished() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InDelegationListAfterColon.after.kt")
         public void testInDelegationListAfterColon() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InDelegationListAfterComma.after.kt")
         public void testInDelegationListAfterComma() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InDelegationListNotEmpty.after.kt")
         public void testInDelegationListNotEmpty() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InEnumInitializerListAfterColon.after.kt")
         public void testInEnumInitializerListAfterColon() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InEnumInitializerListAfterColon.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterColon.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InEnumInitializerListAfterComma.after.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InEnumInitializerListNotEmpty.after.kt")
         public void testInEnumInitializerListNotEmpty() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InExpressionsParentheses.after.kt")
         public void testInExpressionsParentheses() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLabmdaAfterArrow.after.kt")
         public void testInLabmdaAfterArrow() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaAfterArrowWithSpaces.after.kt")
         public void testInLambdaAfterArrowWithSpaces() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaBeforeParams.after.kt")
         public void testInLambdaBeforeParams() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaInsideChainCallSameLine.after.kt")
         public void testInLambdaInsideChainCallSameLine() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaInsideChainCallSameLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallSameLineWithSpaces() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaInsideChainCallWithNewLine.after.kt")
         public void testInLambdaInsideChainCallWithNewLine() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InLambdaInsideChainCallWithNewLineWithSpaces.after.kt")
         public void testInLambdaInsideChainCallWithNewLineWithSpaces() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("InMultilineLambdaAfterArrow.after.kt")
         public void testInMultilineLambdaAfterArrow() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("IsExpressionAfterIs.after.kt")
         public void testIsExpressionAfterIs() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("MultideclarationAfterEq.after.kt")
         public void testMultideclarationAfterEq() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("MultideclarationBeforeEq.after.kt")
         public void testMultideclarationBeforeEq() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("NotFirstParameter.after.kt")
         public void testNotFirstParameter() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/NotFirstParameter.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/NotFirstParameter.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("PropertyWithInference.after.kt")
         public void testPropertyWithInference() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/PropertyWithInference.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/PropertyWithInference.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("ReturnContinue.after.kt")
         public void testReturnContinue() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/ReturnContinue.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/ReturnContinue.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("While.after.kt")
         public void testWhile() throws Exception {
-            doNewlineTest("idea/testData/indentationOnNewline/While.after.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/While.after.kt");
+            doNewlineTest(fileName);
         }
         
         @TestMetadata("idea/testData/indentationOnNewline/script")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Script extends AbstractJetTypingIndentationTestBase {
             public void testAllFilesPresentInScript() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline/script"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
@@ -259,22 +305,26 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
             
             @TestMetadata("ScriptAfterExpression.after.kts")
             public void testScriptAfterExpression() throws Exception {
-                doNewlineTest("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterExpression.after.kts");
+                doNewlineTest(fileName);
             }
             
             @TestMetadata("ScriptAfterFun.after.kts")
             public void testScriptAfterFun() throws Exception {
-                doNewlineTest("idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterFun.after.kts");
+                doNewlineTest(fileName);
             }
             
             @TestMetadata("ScriptAfterImport.after.kts")
             public void testScriptAfterImport() throws Exception {
-                doNewlineTest("idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptAfterImport.after.kts");
+                doNewlineTest(fileName);
             }
             
             @TestMetadata("ScriptInsideFun.after.kts")
             public void testScriptInsideFun() throws Exception {
-                doNewlineTest("idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/script/ScriptInsideFun.after.kts");
+                doNewlineTest(fileName);
             }
             
         }
@@ -288,6 +338,7 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
     }
     
     @TestMetadata("idea/testData/indentationOnNewline")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class InvertedSettings extends AbstractJetTypingIndentationTestBase {
         public void testAllFilesPresentInInvertedSettings() throws Exception {
@@ -296,77 +347,92 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde
         
         @TestMetadata("AssignmentAfterEq.after.inv.kt")
         public void testAssignmentAfterEq() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("BinaryWithTypeExpressions.after.inv.kt")
         public void testBinaryWithTypeExpressions() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InBinaryExpressionInMiddle.after.inv.kt")
         public void testInBinaryExpressionInMiddle() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InBinaryExpressionUnfinished.after.inv.kt")
         public void testInBinaryExpressionUnfinished() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt")
         public void testInBinaryExpressionsBeforeCloseParenthesis() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InDelegationListAfterColon.after.inv.kt")
         public void testInDelegationListAfterColon() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InDelegationListAfterComma.after.inv.kt")
         public void testInDelegationListAfterComma() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InDelegationListNotEmpty.after.inv.kt")
         public void testInDelegationListNotEmpty() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InEnumInitializerListAfterColon.after.inv.kt")
         public void testInEnumInitializerListAfterColon() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InEnumInitializerListAfterColon.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterColon.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InEnumInitializerListAfterComma.after.inv.kt")
         public void testInEnumInitializerListAfterComma() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InEnumInitializerListNotEmpty.after.inv.kt")
         public void testInEnumInitializerListNotEmpty() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InExpressionsParentheses.after.inv.kt")
         public void testInExpressionsParentheses() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("InExpressionsParenthesesBeforeOperand.after.inv.kt")
         public void testInExpressionsParenthesesBeforeOperand() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("IsExpressionAfterIs.after.inv.kt")
         public void testIsExpressionAfterIs() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         @TestMetadata("SettingAlignMultilineParametersInCalls.after.inv.kt")
         public void testSettingAlignMultilineParametersInCalls() throws Exception {
-            doNewlineTestWithInvert("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt");
+            doNewlineTestWithInvert(fileName);
         }
         
         public static Test innerSuite() {
diff --git a/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java
index 22838cc2d9a..7af23f94ac5 100644
--- a/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.resolve.java;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/typeSubstitution")
+@TestDataPath("$PROJECT_ROOT")
 public class JavaTypeSubstitutorTestGenerated extends AbstractJavaTypeSubstitutorTest {
     public void testAllFilesPresentInTypeSubstitution() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typeSubstitution"), Pattern.compile("^(.+)\\.java$"), true);
@@ -35,222 +37,266 @@ public class JavaTypeSubstitutorTestGenerated extends AbstractJavaTypeSubstituto
     
     @TestMetadata("arrayType.java")
     public void testArrayType() throws Exception {
-        doTest("idea/testData/typeSubstitution/arrayType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/arrayType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("classType.java")
     public void testClassType() throws Exception {
-        doTest("idea/testData/typeSubstitution/classType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/classType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("classWithWildcard.java")
     public void testClassWithWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/classWithWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/classWithWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("genericArray.java")
     public void testGenericArray() throws Exception {
-        doTest("idea/testData/typeSubstitution/genericArray.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/genericArray.java");
+        doTest(fileName);
     }
     
     @TestMetadata("innerParameter.java")
     public void testInnerParameter() throws Exception {
-        doTest("idea/testData/typeSubstitution/innerParameter.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/innerParameter.java");
+        doTest(fileName);
     }
     
     @TestMetadata("intersectionType.java")
     public void testIntersectionType() throws Exception {
-        doTest("idea/testData/typeSubstitution/intersectionType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("intersectionTypeAsTypeParameter.java")
     public void testIntersectionTypeAsTypeParameter() throws Exception {
-        doTest("idea/testData/typeSubstitution/intersectionTypeAsTypeParameter.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeAsTypeParameter.java");
+        doTest(fileName);
     }
     
     @TestMetadata("intersectionTypeInEnum.java")
     public void testIntersectionTypeInEnum() throws Exception {
-        doTest("idea/testData/typeSubstitution/intersectionTypeInEnum.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInEnum.java");
+        doTest(fileName);
     }
     
     @TestMetadata("intersectionTypeInInterfaceDeclaration.java")
     public void testIntersectionTypeInInterfaceDeclaration() throws Exception {
-        doTest("idea/testData/typeSubstitution/intersectionTypeInInterfaceDeclaration.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInInterfaceDeclaration.java");
+        doTest(fileName);
     }
     
     @TestMetadata("intersectionTypeInTypeVariableClass.java")
     public void testIntersectionTypeInTypeVariableClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/intersectionTypeInTypeVariableClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/intersectionTypeInTypeVariableClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("mapEntry.java")
     public void testMapEntry() throws Exception {
-        doTest("idea/testData/typeSubstitution/mapEntry.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/mapEntry.java");
+        doTest(fileName);
     }
     
     @TestMetadata("primitiveType.java")
     public void testPrimitiveType() throws Exception {
-        doTest("idea/testData/typeSubstitution/primitiveType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/primitiveType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawArrayType.java")
     public void testRawArrayType() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawArrayType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawArrayTypeParameterWithBound.java")
     public void testRawArrayTypeParameterWithBound() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawArrayTypeParameterWithBound.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawArrayTypeParameterWithBound.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawEnum.java")
     public void testRawEnum() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawEnum.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawEnum.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawExtendsWildcard.java")
     public void testRawExtendsWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawExtendsWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawExtendsWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawIntersectionType.java")
     public void testRawIntersectionType() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawIntersectionType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawIntersectionType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawSuperWildcard.java")
     public void testRawSuperWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawSuperWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawSuperWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawType.java")
     public void testRawType() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawTypeInDeclaration.java")
     public void testRawTypeInDeclaration() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawTypeInDeclaration.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeInDeclaration.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawTypeWithBound.java")
     public void testRawTypeWithBound() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawTypeWithBound.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithBound.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawTypeWithSelfReferenceBound.java")
     public void testRawTypeWithSelfReferenceBound() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawTypeWithSelfReferenceBound.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawTypeWithSelfReferenceBound.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawWildcardInTypeVariableClass.java")
     public void testRawWildcardInTypeVariableClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawWildcardInTypeVariableClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardInTypeVariableClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("rawWildcardWithBound.java")
     public void testRawWildcardWithBound() throws Exception {
-        doTest("idea/testData/typeSubstitution/rawWildcardWithBound.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/rawWildcardWithBound.java");
+        doTest(fileName);
     }
     
     @TestMetadata("selfReference.java")
     public void testSelfReference() throws Exception {
-        doTest("idea/testData/typeSubstitution/selfReference.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/selfReference.java");
+        doTest(fileName);
     }
     
     @TestMetadata("twoParameters.java")
     public void testTwoParameters() throws Exception {
-        doTest("idea/testData/typeSubstitution/twoParameters.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParameters.java");
+        doTest(fileName);
     }
     
     @TestMetadata("twoParametersInSubClass.java")
     public void testTwoParametersInSubClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/twoParametersInSubClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/twoParametersInSubClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("typeVariableClass.java")
     public void testTypeVariableClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/typeVariableClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("typeVariableRaw.java")
     public void testTypeVariableRaw() throws Exception {
-        doTest("idea/testData/typeSubstitution/typeVariableRaw.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/typeVariableRaw.java");
+        doTest(fileName);
     }
     
     @TestMetadata("unboundedWildcard.java")
     public void testUnboundedWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/unboundedWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("unboundedWildcardToTypeParameter.java")
     public void testUnboundedWildcardToTypeParameter() throws Exception {
-        doTest("idea/testData/typeSubstitution/unboundedWildcardToTypeParameter.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/unboundedWildcardToTypeParameter.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargArray.java")
     public void testVarargArray() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargArray.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArray.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargArrayTypeParameter.java")
     public void testVarargArrayTypeParameter() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargArrayTypeParameter.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargArrayTypeParameter.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargClass.java")
     public void testVarargClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargClassWithWildcard.java")
     public void testVarargClassWithWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargClassWithWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargClassWithWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargRawType.java")
     public void testVarargRawType() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargRawType.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawType.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargRawTypeWithBound.java")
     public void testVarargRawTypeWithBound() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargRawTypeWithBound.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargRawTypeWithBound.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargToClass.java")
     public void testVarargToClass() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargToClass.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClass.java");
+        doTest(fileName);
     }
     
     @TestMetadata("varargToClassWithWildcard.java")
     public void testVarargToClassWithWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/varargToClassWithWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/varargToClassWithWildcard.java");
+        doTest(fileName);
     }
     
     @TestMetadata("wildcardExtends.java")
     public void testWildcardExtends() throws Exception {
-        doTest("idea/testData/typeSubstitution/wildcardExtends.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtends.java");
+        doTest(fileName);
     }
     
     @TestMetadata("wildcardExtendsObject.java")
     public void testWildcardExtendsObject() throws Exception {
-        doTest("idea/testData/typeSubstitution/wildcardExtendsObject.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsObject.java");
+        doTest(fileName);
     }
     
     @TestMetadata("wildcardExtendsTypeParameter.java")
     public void testWildcardExtendsTypeParameter() throws Exception {
-        doTest("idea/testData/typeSubstitution/wildcardExtendsTypeParameter.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardExtendsTypeParameter.java");
+        doTest(fileName);
     }
     
     @TestMetadata("wildcardSuper.java")
     public void testWildcardSuper() throws Exception {
-        doTest("idea/testData/typeSubstitution/wildcardSuper.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardSuper.java");
+        doTest(fileName);
     }
     
     @TestMetadata("wildcardToWildcard.java")
     public void testWildcardToWildcard() throws Exception {
-        doTest("idea/testData/typeSubstitution/wildcardToWildcard.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/typeSubstitution/wildcardToWildcard.java");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java
index 67448b40533..ea02591e9b1 100644
--- a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/expressionSelection")
+@TestDataPath("$PROJECT_ROOT")
 public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest {
     public void testAllFilesPresentInExpressionSelection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -35,22 +37,26 @@ public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectio
     
     @TestMetadata("binaryExpr.kt")
     public void testBinaryExpr() throws Exception {
-        doTestExpressionSelection("idea/testData/expressionSelection/binaryExpr.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/binaryExpr.kt");
+        doTestExpressionSelection(fileName);
     }
     
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        doTestExpressionSelection("idea/testData/expressionSelection/labelledStatement.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledStatement.kt");
+        doTestExpressionSelection(fileName);
     }
     
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        doTestExpressionSelection("idea/testData/expressionSelection/labelledThis.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/labelledThis.kt");
+        doTestExpressionSelection(fileName);
     }
     
     @TestMetadata("noExpression.kt")
     public void testNoExpression() throws Exception {
-        doTestExpressionSelection("idea/testData/expressionSelection/noExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/expressionSelection/noExpression.kt");
+        doTestExpressionSelection(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java
index a2b2e5be713..b46ffc2a2c5 100644
--- a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/smartSelection")
+@TestDataPath("$PROJECT_ROOT")
 public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest {
     public void testAllFilesPresentInSmartSelection() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -35,47 +37,56 @@ public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest {
     
     @TestMetadata("labelledStatement.kt")
     public void testLabelledStatement() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/labelledStatement.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledStatement.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("labelledThis.kt")
     public void testLabelledThis() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/labelledThis.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/labelledThis.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/simple.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/simple.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("superExpression.kt")
     public void testSuperExpression() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/superExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpression.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("superExpressionWithLabel.kt")
     public void testSuperExpressionWithLabel() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/superExpressionWithLabel.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabel.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("superExpressionWithLabelAndType.kt")
     public void testSuperExpressionWithLabelAndType() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithLabelAndType.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("superExpressionWithType.kt")
     public void testSuperExpressionWithType() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/superExpressionWithType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/superExpressionWithType.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("typeInSuperExpression.kt")
     public void testTypeInSuperExpression() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/typeInSuperExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpression.kt");
+        doTestSmartSelection(fileName);
     }
     
     @TestMetadata("typeInSuperExpressionWithLabel.kt")
     public void testTypeInSuperExpressionWithLabel() throws Exception {
-        doTestSmartSelection("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/smartSelection/typeInSuperExpressionWithLabel.kt");
+        doTestSmartSelection(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java
index d56c20f6cc0..80469da04b4 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({InsertImportOnPasteTestGenerated.Copy.class, InsertImportOnPasteTestGenerated.Cut.class})
 public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPasteTest {
     @TestMetadata("idea/testData/copyPaste/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Copy extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCopy() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
@@ -37,282 +39,338 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
         
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ClassType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Conflict.kt")
         public void testConflict() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Conflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Conflict.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ConflictWithFun.kt")
         public void testConflictWithFun() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ConflictWithFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithFun.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/EnumEntries.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Extension.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ForLoop.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/FullyQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Function.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/GetExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ImportDependency.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ImportDirective.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Inner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Invoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Local.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Object.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/PackageView.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("PropertyResolvedToPackage.kt")
         public void testPropertyResolvedToPackage() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/PropertyResolvedToPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PropertyResolvedToPackage.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Super.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/ThisReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
+            doTestCopy(fileName);
         }
         
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            doTestCopy("idea/testData/copyPaste/imports/TypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
+            doTestCopy(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/copyPaste/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Cut extends AbstractInsertImportOnPasteTest {
         public void testAllFilesPresentInCut() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false);
@@ -320,277 +378,332 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast
         
         @TestMetadata("AlreadyImportedViaStar.kt")
         public void testAlreadyImportedViaStar() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/AlreadyImportedViaStar.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassAlreadyImported.kt")
         public void testClassAlreadyImported() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassAlreadyImported.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassMember.kt")
         public void testClassMember() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassMember.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObject.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassObjectFunInsideClass.kt")
         public void testClassObjectFunInsideClass() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectFunInsideClass.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassObjectInner.kt")
         public void testClassObjectInner() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassObjectInner.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassResolvedToPackage.kt")
         public void testClassResolvedToPackage() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassResolvedToPackage.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ClassType.kt")
         public void testClassType() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ClassType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ClassType.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Conflict.kt")
         public void testConflict() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Conflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Conflict.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ConflictForTypeWithTypeParameter.kt")
         public void testConflictForTypeWithTypeParameter() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictForTypeWithTypeParameter.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ConflictWithClass.kt")
         public void testConflictWithClass() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithClass.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ConflictWithFun.kt")
         public void testConflictWithFun() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ConflictWithFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ConflictWithFun.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Constructor.kt")
         public void testConstructor() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Constructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Constructor.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DeepInnerClasses.kt")
         public void testDeepInnerClasses() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DeepInnerClasses.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DefaultPackage.kt")
         public void testDefaultPackage() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DefaultPackage.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DelegatedProperty.kt")
         public void testDelegatedProperty() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DelegatedProperty.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DependencyOnJava.kt")
         public void testDependencyOnJava() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnJava.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DependencyOnKotlinLibrary.kt")
         public void testDependencyOnKotlinLibrary() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnKotlinLibrary.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("DependencyOnStdLib.kt")
         public void testDependencyOnStdLib() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/DependencyOnStdLib.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("EnumEntries.kt")
         public void testEnumEntries() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/EnumEntries.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/EnumEntries.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Extension.kt")
         public void testExtension() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Extension.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Extension.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ExtensionAsInfixOrOperator.kt")
         public void testExtensionAsInfixOrOperator() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionAsInfixOrOperator.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ExtensionCannotBeImportedOrLengthened.kt")
         public void testExtensionCannotBeImportedOrLengthened() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionCannotBeImportedOrLengthened.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ExtensionConflict.kt")
         public void testExtensionConflict() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ExtensionConflict.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ForLoop.kt")
         public void testForLoop() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ForLoop.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ForLoop.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("FullyQualified.kt")
         public void testFullyQualified() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/FullyQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FullyQualified.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Function.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Function.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("FunctionAlreadyImported.kt")
         public void testFunctionAlreadyImported() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionAlreadyImported.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("FunctionParameter.kt")
         public void testFunctionParameter() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/FunctionParameter.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("GetExpression.kt")
         public void testGetExpression() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/GetExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/GetExpression.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ImportDependency.kt")
         public void testImportDependency() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ImportDependency.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDependency.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ImportDirective.kt")
         public void testImportDirective() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ImportDirective.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportDirective.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ImportableEntityInExtensionLiteral.kt")
         public void testImportableEntityInExtensionLiteral() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportableEntityInExtensionLiteral.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ImportedElementCopied.kt")
         public void testImportedElementCopied() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ImportedElementCopied.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Inner.kt")
         public void testInner() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Inner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Inner.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Invoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Invoke.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("JavaStaticViaClass.kt")
         public void testJavaStaticViaClass() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/JavaStaticViaClass.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Local.kt")
         public void testLocal() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Local.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Local.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("MultiDeclaration.kt")
         public void testMultiDeclaration() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiDeclaration.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("MultiReferencePartiallyCopied.kt")
         public void testMultiReferencePartiallyCopied() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/MultiReferencePartiallyCopied.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("NoImportForBuiltIns.kt")
         public void testNoImportForBuiltIns() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForBuiltIns.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("NoImportForSamePackage.kt")
         public void testNoImportForSamePackage() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NoImportForSamePackage.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("NotReferencePosition.kt")
         public void testNotReferencePosition() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("NotReferencePosition2.kt")
         public void testNotReferencePosition2() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/NotReferencePosition2.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Object.kt")
         public void testObject() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Object.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Object.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("PackageView.kt")
         public void testPackageView() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/PackageView.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PackageView.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("PartiallyQualified.kt")
         public void testPartiallyQualified() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PartiallyQualified.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("PropertyResolvedToPackage.kt")
         public void testPropertyResolvedToPackage() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/PropertyResolvedToPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/PropertyResolvedToPackage.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("QualifiedTypeConflict.kt")
         public void testQualifiedTypeConflict() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/QualifiedTypeConflict.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ReferencedElementAlsoCopied.kt")
         public void testReferencedElementAlsoCopied() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ReferencedElementAlsoCopied.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Super.kt")
         public void testSuper() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Super.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Super.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("ThisReference.kt")
         public void testThisReference() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/ThisReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/ThisReference.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("TopLevelProperty.kt")
         public void testTopLevelProperty() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TopLevelProperty.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/Trait.kt");
+            doTestCut(fileName);
         }
         
         @TestMetadata("TypeParameter.kt")
         public void testTypeParameter() throws Exception {
-            doTestCut("idea/testData/copyPaste/imports/TypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/imports/TypeParameter.kt");
+            doTestCut(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java
index ad95d52a245..51468ad7f88 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/intentions")
+@TestDataPath("$PROJECT_ROOT")
 public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
     public void testAllFilesPresentInIntentions() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$"));
@@ -35,27 +37,32 @@ public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
     
     @TestMetadata("attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test")
     public void testAttributeCallReplacements_replaceGetIntention_inspectionData_Inspections_test() throws Exception {
-        doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test");
+        doTest(fileName);
     }
     
     @TestMetadata("branched/ifThenToElvis/inspectionData/inspections.test")
     public void testBranched_ifThenToElvis_inspectionData_Inspections_test() throws Exception {
-        doTest("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test");
+        doTest(fileName);
     }
     
     @TestMetadata("branched/ifThenToSafeAccess/inspectionData/inspections.test")
     public void testBranched_ifThenToSafeAccess_inspectionData_Inspections_test() throws Exception {
-        doTest("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test");
+        doTest(fileName);
     }
     
     @TestMetadata("removeExplicitTypeArguments/inspectionData/inspections.test")
     public void testRemoveExplicitTypeArguments_inspectionData_Inspections_test() throws Exception {
-        doTest("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test");
+        doTest(fileName);
     }
     
     @TestMetadata("simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test")
     public void testSimplifyNegatedBinaryExpressionIntention_inspectionData_Inspections_test() throws Exception {
-        doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java
index a0cfba43e65..1008e7505ea 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/codeInsight/outOfBlock")
+@TestDataPath("$PROJECT_ROOT")
 public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest {
     public void testAllFilesPresentInOutOfBlock() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,72 +37,86 @@ public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModif
     
     @TestMetadata("FunInFun.kt")
     public void testFunInFun() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunInFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunNoBody.kt")
     public void testFunNoBody() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/FunNoBody.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InAntonymsObjectDeclaration.kt")
     public void testInAntonymsObjectDeclaration() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InAntonymsObjectDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClass.kt")
     public void testInClass() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassPropertyAccessor.kt")
     public void testInClassPropertyAccessor() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InClassPropertyAccessor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunInFunWithBody.kt")
     public void testInFunInFunWithBody() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInFunWithBody.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunInMultiDeclaration.kt")
     public void testInFunInMultiDeclaration() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunInMultiDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunWithInference.kt")
     public void testInFunWithInference() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunWithInference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionLiteral.kt")
     public void testInFunctionLiteral() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InFunctionLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InGlobalPropertyWithGetter.kt")
     public void testInGlobalPropertyWithGetter() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InGlobalPropertyWithGetter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InMethod.kt")
     public void testInMethod() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InMethod.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InMethod.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InPropertyAccessorWithInference.kt")
     public void testInPropertyAccessorWithInference() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyAccessorWithInference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InPropertyWithFunctionLiteral.kt")
     public void testInPropertyWithFunctionLiteral() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithFunctionLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InPropertyWithInference.kt")
     public void testInPropertyWithInference() throws Exception {
-        doTest("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/outOfBlock/InPropertyWithInference.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java
index 63eb1966de6..d4c45ee79ca 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight.moveUpDown;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({CodeMoverTestGenerated.ClassBodyDeclarations.class, CodeMoverTestGenerated.ClosingBraces.class, CodeMoverTestGenerated.Expressions.class})
 public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
     @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ClassBodyDeclarations.Accessors.class, ClassBodyDeclarations.Class.class, ClassBodyDeclarations.ClassInitializer.class, ClassBodyDeclarations.Enums.class, ClassBodyDeclarations.Function.class, ClassBodyDeclarations.FunctionAnchors.class, ClassBodyDeclarations.Property.class, ClassBodyDeclarations.PropertyAnchors.class})
     public static class ClassBodyDeclarations extends AbstractCodeMoverTest {
         public void testAllFilesPresentInClassBodyDeclarations() throws Exception {
@@ -37,25 +39,30 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Accessors extends AbstractCodeMoverTest {
             @TestMetadata("accessor1.kt")
             public void testAccessor1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("accessor2.kt")
             public void testAccessor2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("accessor3.kt")
             public void testAccessor3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("accessor4.kt")
             public void testAccessor4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors/accessor4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             public void testAllFilesPresentInAccessors() throws Exception {
@@ -65,6 +72,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Class extends AbstractCodeMoverTest {
             public void testAllFilesPresentInClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -72,107 +80,128 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("classAtBrace1.kt")
             public void testClassAtBrace1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtBrace2.kt")
             public void testClassAtBrace2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtBrace3.kt")
             public void testClassAtBrace3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtBrace4.kt")
             public void testClassAtBrace4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtBrace5.kt")
             public void testClassAtBrace5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtBrace6.kt")
             public void testClassAtBrace6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtBrace6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtClass1.kt")
             public void testClassAtClass1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtClass2.kt")
             public void testClassAtClass2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClass2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtClassInitializer1.kt")
             public void testClassAtClassInitializer1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtClassInitializer2.kt")
             public void testClassAtClassInitializer2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtClassInitializer2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtEmptyLine1.kt")
             public void testClassAtEmptyLine1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtEmptyLine2.kt")
             public void testClassAtEmptyLine2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtEmptyLine2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtFunction1.kt")
             public void testClassAtFunction1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtFunction2.kt")
             public void testClassAtFunction2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtFunction2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtProperty1.kt")
             public void testClassAtProperty1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classAtProperty2.kt")
             public void testClassAtProperty2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classAtProperty2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classWithoutBody1.kt")
             public void testClassWithoutBody1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classWithoutBody2.kt")
             public void testClassWithoutBody2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classWithoutBody3.kt")
             public void testClassWithoutBody3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classWithoutBody4.kt")
             public void testClassWithoutBody4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class/classWithoutBody4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassInitializer extends AbstractCodeMoverTest {
             public void testAllFilesPresentInClassInitializer() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -180,67 +209,80 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("classInitializerAtBrace1.kt")
             public void testClassInitializerAtBrace1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtBrace2.kt")
             public void testClassInitializerAtBrace2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtBrace2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtClass1.kt")
             public void testClassInitializerAtClass1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtClass2.kt")
             public void testClassInitializerAtClass2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClass2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtClassInitializer1.kt")
             public void testClassInitializerAtClassInitializer1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtClassInitializer2.kt")
             public void testClassInitializerAtClassInitializer2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtClassInitializer2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtEmptyLine1.kt")
             public void testClassInitializerAtEmptyLine1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtEmptyLine2.kt")
             public void testClassInitializerAtEmptyLine2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtEmptyLine2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtFunction1.kt")
             public void testClassInitializerAtFunction1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtFunction2.kt")
             public void testClassInitializerAtFunction2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtFunction2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtProperty1.kt")
             public void testClassInitializerAtProperty1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("classInitializerAtProperty2.kt")
             public void testClassInitializerAtProperty2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer/classInitializerAtProperty2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Enums extends AbstractCodeMoverTest {
             public void testAllFilesPresentInEnums() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -248,37 +290,44 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("enum1.kt")
             public void testEnum1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("enum2.kt")
             public void testEnum2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("enum3.kt")
             public void testEnum3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("enum4.kt")
             public void testEnum4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("enum5.kt")
             public void testEnum5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("enum6.kt")
             public void testEnum6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums/enum6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Function extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunction() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -286,87 +335,104 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("functionAtBrace1.kt")
             public void testFunctionAtBrace1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtBrace2.kt")
             public void testFunctionAtBrace2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtBrace3.kt")
             public void testFunctionAtBrace3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtBrace4.kt")
             public void testFunctionAtBrace4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtBrace5.kt")
             public void testFunctionAtBrace5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtBrace6.kt")
             public void testFunctionAtBrace6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtBrace6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtClass1.kt")
             public void testFunctionAtClass1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtClass2.kt")
             public void testFunctionAtClass2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClass2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtClassInitializer1.kt")
             public void testFunctionAtClassInitializer1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtClassInitializer2.kt")
             public void testFunctionAtClassInitializer2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtClassInitializer2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtEmptyLine1.kt")
             public void testFunctionAtEmptyLine1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtEmptyLine2.kt")
             public void testFunctionAtEmptyLine2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtEmptyLine2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtFunction1.kt")
             public void testFunctionAtFunction1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtFunction2.kt")
             public void testFunctionAtFunction2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtFunction2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtProperty1.kt")
             public void testFunctionAtProperty1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("functionAtProperty2.kt")
             public void testFunctionAtProperty2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function/functionAtProperty2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FunctionAnchors extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunctionAnchors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -374,97 +440,116 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("keyword.kt")
             public void testKeyword() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/keyword.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("name.kt")
             public void testName() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/name.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("returnType.kt")
             public void testReturnType() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/returnType.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("typeParams1.kt")
             public void testTypeParams1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("typeParams2.kt")
             public void testTypeParams2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("typeParams3.kt")
             public void testTypeParams3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs1.kt")
             public void testValueArgs1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs2.kt")
             public void testValueArgs2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs3.kt")
             public void testValueArgs3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs4.kt")
             public void testValueArgs4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs5.kt")
             public void testValueArgs5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueArgs6.kt")
             public void testValueArgs6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams1.kt")
             public void testValueParams1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams2.kt")
             public void testValueParams2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams3.kt")
             public void testValueParams3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams4.kt")
             public void testValueParams4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams5.kt")
             public void testValueParams5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("valueParams6.kt")
             public void testValueParams6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Property extends AbstractCodeMoverTest {
             public void testAllFilesPresentInProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -472,87 +557,104 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("propertyAtBrace1.kt")
             public void testPropertyAtBrace1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtBrace2.kt")
             public void testPropertyAtBrace2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtBrace3.kt")
             public void testPropertyAtBrace3() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace3.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtBrace4.kt")
             public void testPropertyAtBrace4() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace4.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtBrace5.kt")
             public void testPropertyAtBrace5() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace5.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtBrace6.kt")
             public void testPropertyAtBrace6() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtBrace6.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtClass1.kt")
             public void testPropertyAtClass1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtClass2.kt")
             public void testPropertyAtClass2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClass2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtClassInitializer1.kt")
             public void testPropertyAtClassInitializer1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtClassInitializer2.kt")
             public void testPropertyAtClassInitializer2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtClassInitializer2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtEmptyLine1.kt")
             public void testPropertyAtEmptyLine1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtEmptyLine2.kt")
             public void testPropertyAtEmptyLine2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtEmptyLine2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtFunction1.kt")
             public void testPropertyAtFunction1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtFunction2.kt")
             public void testPropertyAtFunction2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtFunction2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtProperty1.kt")
             public void testPropertyAtProperty1() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty1.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("propertyAtProperty2.kt")
             public void testPropertyAtProperty2() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property/propertyAtProperty2.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PropertyAnchors extends AbstractCodeMoverTest {
             public void testAllFilesPresentInPropertyAnchors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -560,17 +662,20 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("keyword.kt")
             public void testKeyword() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/keyword.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("name.kt")
             public void testName() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/name.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
             @TestMetadata("returnType.kt")
             public void testReturnType() throws Exception {
-                doTestClassBodyDeclaration("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors/returnType.kt");
+                doTestClassBodyDeclaration(fileName);
             }
             
         }
@@ -591,6 +696,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
     }
     
     @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ClosingBraces.For.class, ClosingBraces.Function.class, ClosingBraces.If.class, ClosingBraces.Nested.class, ClosingBraces.When.class, ClosingBraces.While.class})
     public static class ClosingBraces extends AbstractCodeMoverTest {
         public void testAllFilesPresentInClosingBraces() throws Exception {
@@ -598,6 +704,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for")
+        @TestDataPath("$PROJECT_ROOT")
         public static class For extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFor() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/for"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -605,17 +712,20 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("for1.kt")
             public void testFor1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/for/for1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("for2.kt")
             public void testFor2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/for/for2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for/for2.kt");
+                doTestExpression(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Function extends AbstractCodeMoverTest {
             public void testAllFilesPresentInFunction() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -623,27 +733,32 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("function1.kt")
             public void testFunction1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/function/function1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("function2.kt")
             public void testFunction2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/function/function2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function2.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("function3.kt")
             public void testFunction3() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/function/function3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function3.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("function4.kt")
             public void testFunction4() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/function/function4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function/function4.kt");
+                doTestExpression(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if")
+        @TestDataPath("$PROJECT_ROOT")
         public static class If extends AbstractCodeMoverTest {
             public void testAllFilesPresentInIf() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/if"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -651,27 +766,32 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("if1.kt")
             public void testIf1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/if/if1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("if2.kt")
             public void testIf2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/if/if2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if2.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("if3.kt")
             public void testIf3() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/if/if3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if3.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("if4.kt")
             public void testIf4() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/if/if4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if/if4.kt");
+                doTestExpression(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Nested extends AbstractCodeMoverTest {
             public void testAllFilesPresentInNested() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/nested"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -679,17 +799,20 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("nested1.kt")
             public void testNested1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("nested2.kt")
             public void testNested2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested/nested2.kt");
+                doTestExpression(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when")
+        @TestDataPath("$PROJECT_ROOT")
         public static class When extends AbstractCodeMoverTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -697,37 +820,44 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("when1.kt")
             public void testWhen1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/when1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("when2.kt")
             public void testWhen2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/when2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/when2.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("whenEntry1.kt")
             public void testWhenEntry1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("whenEntry2.kt")
             public void testWhenEntry2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry2.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("whenEntry3.kt")
             public void testWhenEntry3() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry3.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("whenEntry4.kt")
             public void testWhenEntry4() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when/whenEntry4.kt");
+                doTestExpression(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while")
+        @TestDataPath("$PROJECT_ROOT")
         public static class While extends AbstractCodeMoverTest {
             public void testAllFilesPresentInWhile() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/while"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -735,22 +865,26 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             
             @TestMetadata("while1.kt")
             public void testWhile1() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/while/while1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while1.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("while2.kt")
             public void testWhile2() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/while/while2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while2.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("while3.kt")
             public void testWhile3() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/while/while3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while3.kt");
+                doTestExpression(fileName);
             }
             
             @TestMetadata("while4.kt")
             public void testWhile4() throws Exception {
-                doTestExpression("idea/testData/codeInsight/moveUpDown/closingBraces/while/while4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while/while4.kt");
+                doTestExpression(fileName);
             }
             
         }
@@ -769,6 +903,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
     }
     
     @TestMetadata("idea/testData/codeInsight/moveUpDown/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractCodeMoverTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/expressions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -776,337 +911,404 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
         
         @TestMetadata("binaryExpr1.kt")
         public void testBinaryExpr1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("binaryExpr2.kt")
         public void testBinaryExpr2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/binaryExpr2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureBlockBoundary1.kt")
         public void testClosureBlockBoundary1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureBlockBoundary2.kt")
         public void testClosureBlockBoundary2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureBlockBoundary2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInDoWhile1.kt")
         public void testClosureInDoWhile1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInDoWhile2.kt")
         public void testClosureInDoWhile2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInDoWhile2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInFor1.kt")
         public void testClosureInFor1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInFor1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInFor2.kt")
         public void testClosureInFor2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInFor2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInFor2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInIf1.kt")
         public void testClosureInIf1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInIf1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInIf2.kt")
         public void testClosureInIf2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInIf2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInIf2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInWhile1.kt")
         public void testClosureInWhile1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureInWhile2.kt")
         public void testClosureInWhile2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureInWhile2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureWthoutSpaces1.kt")
         public void testClosureWthoutSpaces1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("closureWthoutSpaces2.kt")
         public void testClosureWthoutSpaces2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/closureWthoutSpaces2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("declaration1.kt")
         public void testDeclaration1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/declaration1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("declaration2.kt")
         public void testDeclaration2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/declaration2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/declaration2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("If1.kt")
         public void testIf1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/If1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/If1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("if2.kt")
         public void testIf2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/if2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("if3.kt")
         public void testIf3() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/if3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if3.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("if4.kt")
         public void testIf4() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/if4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/if4.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("ifExprToBlock1.kt")
         public void testIfExprToBlock1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("ifExprToBlock2.kt")
         public void testIfExprToBlock2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifExprToBlock2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("ifToBlock1.kt")
         public void testIfToBlock1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("ifToBlock2.kt")
         public void testIfToBlock2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/ifToBlock2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("insideExpression1.kt")
         public void testInsideExpression1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("insideExpression2.kt")
         public void testInsideExpression2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/insideExpression2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("insideExpression3.kt")
         public void testInsideExpression3() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression3.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("insideExpression4.kt")
         public void testInsideExpression4() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/insideExpression4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/insideExpression4.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoClosure1.kt")
         public void testIntoClosure1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoClosure1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoClosure2.kt")
         public void testIntoClosure2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoClosure2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosure2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoClosureWithParams1.kt")
         public void testIntoClosureWithParams1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoClosureWithParams1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoClosureWithParams1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoElse1.kt")
         public void testIntoElse1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoElse1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoElse2.kt")
         public void testIntoElse2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoElse2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoElse2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoNestedClosure1.kt")
         public void testIntoNestedClosure1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoNestedClosure2.kt")
         public void testIntoNestedClosure2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosure2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("intoNestedClosureWithParams1.kt")
         public void testIntoNestedClosureWithParams1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosureWithParams1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/intoNestedClosureWithParams1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("lambda1.kt")
         public void testLambda1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/lambda1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("lambda2.kt")
         public void testLambda2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/lambda2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("lambda3.kt")
         public void testLambda3() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/lambda3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/lambda3.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment1.kt")
         public void testMultilineComment1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment2.kt")
         public void testMultilineComment2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment3.kt")
         public void testMultilineComment3() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment3.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment4.kt")
         public void testMultilineComment4() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment4.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment5.kt")
         public void testMultilineComment5() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment5.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("multilineComment6.kt")
         public void testMultilineComment6() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/multilineComment6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/multilineComment6.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfClosure1.kt")
         public void testOutOfClosure1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfClosure2.kt")
         public void testOutOfClosure2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosure2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfClosureWithParams1.kt")
         public void testOutOfClosureWithParams1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfClosureWithParams1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfClosureWithParams1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfElse1.kt")
         public void testOutOfElse1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfElse1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfElse2.kt")
         public void testOutOfElse2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfElse2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfElse2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfNestedClosure1.kt")
         public void testOutOfNestedClosure1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfNestedClosure2.kt")
         public void testOutOfNestedClosure2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosure2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("outOfNestedClosureWithParams1.kt")
         public void testOutOfNestedClosureWithParams1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosureWithParams1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/outOfNestedClosureWithParams1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("qualifiedCall1.kt")
         public void testQualifiedCall1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("qualifiedCall2.kt")
         public void testQualifiedCall2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/qualifiedCall2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("when1.kt")
         public void testWhen1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/when1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("when2.kt")
         public void testWhen2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/when2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/when2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry1.kt")
         public void testWhenEntry1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry2.kt")
         public void testWhenEntry2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry3.kt")
         public void testWhenEntry3() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry3.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry4.kt")
         public void testWhenEntry4() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry4.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry5.kt")
         public void testWhenEntry5() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry5.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whenEntry6.kt")
         public void testWhenEntry6() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whenEntry6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whenEntry6.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("while1.kt")
         public void testWhile1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/while1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("while2.kt")
         public void testWhile2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/while2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/while2.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whileToBlock1.kt")
         public void testWhileToBlock1() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock1.kt");
+            doTestExpression(fileName);
         }
         
         @TestMetadata("whileToBlock2.kt")
         public void testWhileToBlock2() throws Exception {
-            doTestExpression("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/expressions/whileToBlock2.kt");
+            doTestExpression(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java
index 22a0bc328b7..fb4a4c3c252 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight.surroundWith;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({SurroundWithTestGenerated.If.class, SurroundWithTestGenerated.IfElse.class, SurroundWithTestGenerated.Not.class, SurroundWithTestGenerated.Parentheses.class, SurroundWithTestGenerated.StringTemplate.class, SurroundWithTestGenerated.When.class, SurroundWithTestGenerated.TryCatch.class, SurroundWithTestGenerated.TryCatchFinally.class, SurroundWithTestGenerated.TryFinally.class, SurroundWithTestGenerated.FunctionLiteral.class})
 public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     @TestMetadata("idea/testData/codeInsight/surroundWith/if")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({If.MoveDeclarationsOut.class})
     public static class If extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIf() throws Exception {
@@ -38,30 +40,36 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/block.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/block.kt");
+            doTestWithIfSurrounder(fileName);
         }
         
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/severalStatements.kt");
+            doTestWithIfSurrounder(fileName);
         }
         
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatement.kt");
+            doTestWithIfSurrounder(fileName);
         }
         
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/singleStatementAtCaret.kt");
+            doTestWithIfSurrounder(fileName);
         }
         
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/variable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/variable.kt");
+            doTestWithIfSurrounder(fileName);
         }
         
         @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({MoveDeclarationsOut.Class.class, MoveDeclarationsOut.Function.class, MoveDeclarationsOut.Object.class, MoveDeclarationsOut.Order.class, MoveDeclarationsOut.Val.class, MoveDeclarationsOut.Var.class})
         public static class MoveDeclarationsOut extends AbstractSurroundWithTest {
             public void testAllFilesPresentInMoveDeclarationsOut() throws Exception {
@@ -69,6 +77,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Class extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInClass() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -76,17 +85,20 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("classInType.kt")
                 public void testClassInType() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/classInType.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class/localClass.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Function extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInFunction() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -94,22 +106,26 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("firstChildLocalFun.kt")
                 public void testFirstChildLocalFun() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/firstChildLocalFun.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("localFun.kt")
                 public void testLocalFun() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/localFun.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("unusedLocalFun.kt")
                 public void testUnusedLocalFun() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function/unusedLocalFun.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Object extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInObject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -117,12 +133,14 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("localObject.kt")
                 public void testLocalObject() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object/localObject.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Order extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInOrder() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -130,22 +148,26 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("twoClasses.kt")
                 public void testTwoClasses() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/twoClasses.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("valAndClass.kt")
                 public void testValAndClass() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valAndClass.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("valOrder.kt")
                 public void testValOrder() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order/valOrder.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Val extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVal() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -153,32 +175,38 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("fullQualifiedType.kt")
                 public void testFullQualifiedType() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedType.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("fullQualifiedTypeWithoutTypeRef.kt")
                 public void testFullQualifiedTypeWithoutTypeRef() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/fullQualifiedTypeWithoutTypeRef.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("valWithTypeWithInitializer.kt")
                 public void testValWithTypeWithInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWithInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("valWithTypeWoInitializer.kt")
                 public void testValWithTypeWoInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWithTypeWoInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("valWoTypeWithInitializer.kt")
                 public void testValWoTypeWithInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val/valWoTypeWithInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Var.DefaultValue.class})
             public static class Var extends AbstractSurroundWithTest {
                 public void testAllFilesPresentInVar() throws Exception {
@@ -187,20 +215,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                 
                 @TestMetadata("varWithNotNullableTypeWithInitializer.kt")
                 public void testVarWithNotNullableTypeWithInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithNotNullableTypeWithInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("varWithTypeWoInitializer.kt")
                 public void testVarWithTypeWoInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWithTypeWoInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("varWoTypeWithInitializer.kt")
                 public void testVarWoTypeWithInitializer() throws Exception {
-                    doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/varWoTypeWithInitializer.kt");
+                    doTestWithIfSurrounder(fileName);
                 }
                 
                 @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class DefaultValue extends AbstractSurroundWithTest {
                     public void testAllFilesPresentInDefaultValue() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -208,17 +240,20 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
                     
                     @TestMetadata("boolean.kt")
                     public void testBoolean() throws Exception {
-                        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/boolean.kt");
+                        doTestWithIfSurrounder(fileName);
                     }
                     
                     @TestMetadata("nullable.kt")
                     public void testNullable() throws Exception {
-                        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/nullable.kt");
+                        doTestWithIfSurrounder(fileName);
                     }
                     
                     @TestMetadata("primitiveNumbers.kt")
                     public void testPrimitiveNumbers() throws Exception {
-                        doTestWithIfSurrounder("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
+                        String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue/primitiveNumbers.kt");
+                        doTestWithIfSurrounder(fileName);
                     }
                     
                 }
@@ -253,6 +288,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/ifElse")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IfElse extends AbstractSurroundWithTest {
         public void testAllFilesPresentInIfElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -260,42 +296,50 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("block.kt")
         public void testBlock() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/block.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("moveDeclarationsOutVal.kt")
         public void testMoveDeclarationsOutVal() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVal.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("moveDeclarationsOutVar.kt")
         public void testMoveDeclarationsOutVar() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/moveDeclarationsOutVar.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("severalStatements.kt")
         public void testSeveralStatements() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/severalStatements.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatement.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("singleStatementAtCaret.kt")
         public void testSingleStatementAtCaret() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/singleStatementAtCaret.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            doTestWithIfElseSurrounder("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/ifElse/variable.kt");
+            doTestWithIfElseSurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/not")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Not extends AbstractSurroundWithTest {
         public void testAllFilesPresentInNot() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -303,42 +347,50 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("booleanExpr.kt")
         public void testBooleanExpr() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExpr.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("booleanExprAtCaret.kt")
         public void testBooleanExprAtCaret() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/booleanExprAtCaret.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("expressionInIf.kt")
         public void testExpressionInIf() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/expressionInIf.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("notExpression.kt")
         public void testNotExpression() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/notExpression.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("severalExpr.kt")
         public void testSeveralExpr() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExpr.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("severalExprAtCaret.kt")
         public void testSeveralExprAtCaret() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/severalExprAtCaret.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
-            doTestWithNotSurrounder("idea/testData/codeInsight/surroundWith/not/variable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/not/variable.kt");
+            doTestWithNotSurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Parentheses.NotApplicable.class})
     public static class Parentheses extends AbstractSurroundWithTest {
         public void testAllFilesPresentInParentheses() throws Exception {
@@ -347,20 +399,24 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("expr.kt")
         public void testExpr() throws Exception {
-            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/expr.kt");
+            doTestWithParenthesesSurrounder(fileName);
         }
         
         @TestMetadata("inIf.kt")
         public void testInIf() throws Exception {
-            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/inIf.kt");
+            doTestWithParenthesesSurrounder(fileName);
         }
         
         @TestMetadata("partOfExpr.kt")
         public void testPartOfExpr() throws Exception {
-            doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/partOfExpr.kt");
+            doTestWithParenthesesSurrounder(fileName);
         }
         
         @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NotApplicable extends AbstractSurroundWithTest {
             public void testAllFilesPresentInNotApplicable() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -368,47 +424,56 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
             
             @TestMetadata("if.kt")
             public void testIf() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/if.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("import.kt")
             public void testImport() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/import.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("importQualifiedFirst.kt")
             public void testImportQualifiedFirst() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedFirst.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("importQualifiedSecond.kt")
             public void testImportQualifiedSecond() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/importQualifiedSecond.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("packageName.kt")
             public void testPackageName() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/packageName.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("parameterName.kt")
             public void testParameterName() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterName.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("parameterWithType.kt")
             public void testParameterWithType() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/parameterWithType.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("qualifiedExpressionSecond.kt")
             public void testQualifiedExpressionSecond() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecond.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
             @TestMetadata("qualifiedExpressionSecondWithBracket.kt")
             public void testQualifiedExpressionSecondWithBracket() throws Exception {
-                doTestWithParenthesesSurrounder("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable/qualifiedExpressionSecondWithBracket.kt");
+                doTestWithParenthesesSurrounder(fileName);
             }
             
         }
@@ -422,6 +487,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/stringTemplate")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StringTemplate extends AbstractSurroundWithTest {
         public void testAllFilesPresentInStringTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -429,27 +495,32 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpression.kt");
+            doTestWithStringTemplateSurrounder(fileName);
         }
         
         @TestMetadata("multiExpressionConstant.kt")
         public void testMultiExpressionConstant() throws Exception {
-            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/multiExpressionConstant.kt");
+            doTestWithStringTemplateSurrounder(fileName);
         }
         
         @TestMetadata("singleConstant.kt")
         public void testSingleConstant() throws Exception {
-            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleConstant.kt");
+            doTestWithStringTemplateSurrounder(fileName);
         }
         
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            doTestWithStringTemplateSurrounder("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/stringTemplate/singleExpression.kt");
+            doTestWithStringTemplateSurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractSurroundWithTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -457,22 +528,26 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/enum.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/enum.kt");
+            doTestWithWhenSurrounder(fileName);
         }
         
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/multiExpression.kt");
+            doTestWithWhenSurrounder(fileName);
         }
         
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            doTestWithWhenSurrounder("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/when/singleExpression.kt");
+            doTestWithWhenSurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatch")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatch extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -480,22 +555,26 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/moveDeclarationsOut.kt");
+            doTestWithTryCatchSurrounder(fileName);
         }
         
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/multiExpression.kt");
+            doTestWithTryCatchSurrounder(fileName);
         }
         
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            doTestWithTryCatchSurrounder("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatch/singleExpression.kt");
+            doTestWithTryCatchSurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryCatchFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryCatchFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -503,17 +582,20 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/multiExpression.kt");
+            doTestWithTryCatchFinallySurrounder(fileName);
         }
         
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            doTestWithTryCatchFinallySurrounder("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally/singleExpression.kt");
+            doTestWithTryCatchFinallySurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/tryFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryFinally extends AbstractSurroundWithTest {
         public void testAllFilesPresentInTryFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -521,17 +603,20 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("multiExpression.kt")
         public void testMultiExpression() throws Exception {
-            doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/multiExpression.kt");
+            doTestWithTryFinallySurrounder(fileName);
         }
         
         @TestMetadata("singleExpression.kt")
         public void testSingleExpression() throws Exception {
-            doTestWithTryFinallySurrounder("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/tryFinally/singleExpression.kt");
+            doTestWithTryFinallySurrounder(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/surroundWith/functionLiteral")
+    @TestDataPath("$PROJECT_ROOT")
     public static class FunctionLiteral extends AbstractSurroundWithTest {
         public void testAllFilesPresentInFunctionLiteral() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -539,17 +624,20 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
         
         @TestMetadata("moveDeclarationsOut.kt")
         public void testMoveDeclarationsOut() throws Exception {
-            doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/moveDeclarationsOut.kt");
+            doTestWithFunctionLiteralSurrounder(fileName);
         }
         
         @TestMetadata("multiStatement.kt")
         public void testMultiStatement() throws Exception {
-            doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/multiStatement.kt");
+            doTestWithFunctionLiteralSurrounder(fileName);
         }
         
         @TestMetadata("singleStatement.kt")
         public void testSingleStatement() throws Exception {
-            doTestWithFunctionLiteralSurrounder("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/surroundWith/functionLiteral/singleStatement.kt");
+            doTestWithFunctionLiteralSurrounder(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java
index 7ed10cab5a5..7457af66ac9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.codeInsight.unwrap;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({UnwrapRemoveTestGenerated.RemoveExpression.class, UnwrapRemoveTestGenerated.UnwrapThen.class, UnwrapRemoveTestGenerated.UnwrapElse.class, UnwrapRemoveTestGenerated.RemoveElse.class, UnwrapRemoveTestGenerated.UnwrapLoop.class, UnwrapRemoveTestGenerated.UnwrapTry.class, UnwrapRemoveTestGenerated.UnwrapCatch.class, UnwrapRemoveTestGenerated.RemoveCatch.class, UnwrapRemoveTestGenerated.UnwrapFinally.class, UnwrapRemoveTestGenerated.RemoveFinally.class, UnwrapRemoveTestGenerated.UnwrapLambda.class})
 public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveExpression extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,32 +39,38 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("ifInBlock.kt")
         public void testIfInBlock() throws Exception {
-            doTestExpressionRemover("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInBlock.kt");
+            doTestExpressionRemover(fileName);
         }
         
         @TestMetadata("ifInExpressionInReturn.kt")
         public void testIfInExpressionInReturn() throws Exception {
-            doTestExpressionRemover("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInExpressionInReturn.kt");
+            doTestExpressionRemover(fileName);
         }
         
         @TestMetadata("ifInReturn.kt")
         public void testIfInReturn() throws Exception {
-            doTestExpressionRemover("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/ifInReturn.kt");
+            doTestExpressionRemover(fileName);
         }
         
         @TestMetadata("tryInBlock.kt")
         public void testTryInBlock() throws Exception {
-            doTestExpressionRemover("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInBlock.kt");
+            doTestExpressionRemover(fileName);
         }
         
         @TestMetadata("tryInReturn.kt")
         public void testTryInReturn() throws Exception {
-            doTestExpressionRemover("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression/tryInReturn.kt");
+            doTestExpressionRemover(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapThen extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapThen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -70,22 +78,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("thenCompoundInBlock.kt")
         public void testThenCompoundInBlock() throws Exception {
-            doTestThenUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInBlock.kt");
+            doTestThenUnwrapper(fileName);
         }
         
         @TestMetadata("thenCompoundInReturn.kt")
         public void testThenCompoundInReturn() throws Exception {
-            doTestThenUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenCompoundInReturn.kt");
+            doTestThenUnwrapper(fileName);
         }
         
         @TestMetadata("thenSimpleInReturn.kt")
         public void testThenSimpleInReturn() throws Exception {
-            doTestThenUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen/thenSimpleInReturn.kt");
+            doTestThenUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -93,22 +105,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("elseCompoundInBlock.kt")
         public void testElseCompoundInBlock() throws Exception {
-            doTestElseUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInBlock.kt");
+            doTestElseUnwrapper(fileName);
         }
         
         @TestMetadata("elseCompoundInReturn.kt")
         public void testElseCompoundInReturn() throws Exception {
-            doTestElseUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseCompoundInReturn.kt");
+            doTestElseUnwrapper(fileName);
         }
         
         @TestMetadata("elseSimpleInReturn.kt")
         public void testElseSimpleInReturn() throws Exception {
-            doTestElseUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse/elseSimpleInReturn.kt");
+            doTestElseUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveElse extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveElse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -116,12 +132,14 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("else.kt")
         public void testElse() throws Exception {
-            doTestElseRemover("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse/else.kt");
+            doTestElseRemover(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapLoop extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLoop() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -129,22 +147,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("doWhile.kt")
         public void testDoWhile() throws Exception {
-            doTestLoopUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/doWhile.kt");
+            doTestLoopUnwrapper(fileName);
         }
         
         @TestMetadata("for.kt")
         public void testFor() throws Exception {
-            doTestLoopUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/for.kt");
+            doTestLoopUnwrapper(fileName);
         }
         
         @TestMetadata("while.kt")
         public void testWhile() throws Exception {
-            doTestLoopUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop/while.kt");
+            doTestLoopUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapTry extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapTry() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -152,22 +174,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("tryCompoundInBlock.kt")
         public void testTryCompoundInBlock() throws Exception {
-            doTestTryUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInBlock.kt");
+            doTestTryUnwrapper(fileName);
         }
         
         @TestMetadata("tryCompoundInReturn.kt")
         public void testTryCompoundInReturn() throws Exception {
-            doTestTryUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/tryCompoundInReturn.kt");
+            doTestTryUnwrapper(fileName);
         }
         
         @TestMetadata("trySimpleInReturn.kt")
         public void testTrySimpleInReturn() throws Exception {
-            doTestTryUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry/trySimpleInReturn.kt");
+            doTestTryUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -175,22 +201,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("catchCompoundInBlock.kt")
         public void testCatchCompoundInBlock() throws Exception {
-            doTestCatchUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInBlock.kt");
+            doTestCatchUnwrapper(fileName);
         }
         
         @TestMetadata("catchCompoundInReturn.kt")
         public void testCatchCompoundInReturn() throws Exception {
-            doTestCatchUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchCompoundInReturn.kt");
+            doTestCatchUnwrapper(fileName);
         }
         
         @TestMetadata("catchSimpleInReturn.kt")
         public void testCatchSimpleInReturn() throws Exception {
-            doTestCatchUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch/catchSimpleInReturn.kt");
+            doTestCatchUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveCatch extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveCatch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -198,12 +228,14 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("catch.kt")
         public void testCatch() throws Exception {
-            doTestCatchRemover("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch/catch.kt");
+            doTestCatchRemover(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -211,22 +243,26 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("finallyCompoundInBlock.kt")
         public void testFinallyCompoundInBlock() throws Exception {
-            doTestFinallyUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInBlock.kt");
+            doTestFinallyUnwrapper(fileName);
         }
         
         @TestMetadata("finallyCompoundInReturn.kt")
         public void testFinallyCompoundInReturn() throws Exception {
-            doTestFinallyUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallyCompoundInReturn.kt");
+            doTestFinallyUnwrapper(fileName);
         }
         
         @TestMetadata("finallySimpleInReturn.kt")
         public void testFinallySimpleInReturn() throws Exception {
-            doTestFinallyUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally/finallySimpleInReturn.kt");
+            doTestFinallyUnwrapper(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveFinally extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInRemoveFinally() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -234,17 +270,20 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("finallyInBlock.kt")
         public void testFinallyInBlock() throws Exception {
-            doTestFinallyRemover("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInBlock.kt");
+            doTestFinallyRemover(fileName);
         }
         
         @TestMetadata("finallyInReturn.kt")
         public void testFinallyInReturn() throws Exception {
-            doTestFinallyRemover("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally/finallyInReturn.kt");
+            doTestFinallyRemover(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UnwrapLambda extends AbstractUnwrapRemoveTest {
         public void testAllFilesPresentInUnwrapLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -252,52 +291,62 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
         
         @TestMetadata("lambdaCallCompoundInBlock.kt")
         public void testLambdaCallCompoundInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaCallCompoundInReturn.kt")
         public void testLambdaCallCompoundInReturn() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallCompoundInReturn.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaCallInBlock.kt")
         public void testLambdaCallInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaCallInBlock2.kt")
         public void testLambdaCallInBlock2() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallInBlock2.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaCallSimpleInReturn.kt")
         public void testLambdaCallSimpleInReturn() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaCallSimpleInReturn.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaInBlock.kt")
         public void testLambdaInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaNonLocalPropertyCompoundInBlock.kt")
         public void testLambdaNonLocalPropertyCompoundInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyCompoundInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaNonLocalPropertyInBlock.kt")
         public void testLambdaNonLocalPropertyInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaNonLocalPropertyInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaPropertyCompoundInBlock.kt")
         public void testLambdaPropertyCompoundInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyCompoundInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
         @TestMetadata("lambdaPropertyInBlock.kt")
         public void testLambdaPropertyInBlock() throws Exception {
-            doTestLambdaUnwrapper("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda/lambdaPropertyInBlock.kt");
+            doTestLambdaUnwrapper(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java
index b75f8bf3391..175485bf230 100644
--- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.configuration;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({ConfigureProjectByChangingFileTestGenerated.Android_gradle.class, ConfigureProjectByChangingFileTestGenerated.Gradle.class, ConfigureProjectByChangingFileTestGenerated.Maven.class})
 public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest {
     @TestMetadata("idea/testData/configuration/android-gradle")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Android_gradle.GradleExamples.class})
     public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInAndroid_gradle() throws Exception {
@@ -38,60 +40,72 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         
         @TestMetadata("androidStudioDefault_before.gradle")
         public void testAndroidStudioDefault() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefault_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("androidStudioDefaultShapshot_before.gradle")
         public void testAndroidStudioDefaultShapshot() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/androidStudioDefaultShapshot_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("buildConfigs_before.gradle")
         public void testBuildConfigs() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/buildConfigs_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("emptyDependencyList_before.gradle")
         public void testEmptyDependencyList() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyDependencyList_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("emptyFile_before.gradle")
         public void testEmptyFile() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/emptyFile_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("helloWorld_before.gradle")
         public void testHelloWorld() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/helloWorld_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("libraryFile_before.gradle")
         public void testLibraryFile() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/libraryFile_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("missedApplyAndroidStatement_before.gradle")
         public void testMissedApplyAndroidStatement() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedApplyAndroidStatement_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("missedBuildscriptBlock_before.gradle")
         public void testMissedBuildscriptBlock() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedBuildscriptBlock_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("missedRepositoriesInBuildscriptBlock_before.gradle")
         public void testMissedRepositoriesInBuildscriptBlock() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/missedRepositoriesInBuildscriptBlock_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("productFlavor_before.gradle")
         public void testProductFlavor() throws Exception {
-            doTestAndroidGradle("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/productFlavor_before.gradle");
+            doTestAndroidGradle(fileName);
         }
         
         @TestMetadata("idea/testData/configuration/android-gradle/gradleExamples")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GradleExamples extends AbstractConfigureProjectByChangingFileTest {
             public void testAllFilesPresentInGradleExamples() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
@@ -99,47 +113,56 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
             
             @TestMetadata("gradleExample0_before.gradle")
             public void testGradleExample0() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample18_before.gradle")
             public void testGradleExample18() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample22_before.gradle")
             public void testGradleExample22() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample44_before.gradle")
             public void testGradleExample44() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample5_before.gradle")
             public void testGradleExample5() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample50_before.gradle")
             public void testGradleExample50() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample58_before.gradle")
             public void testGradleExample58() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample65_before.gradle")
             public void testGradleExample65() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
             @TestMetadata("gradleExample8_before.gradle")
             public void testGradleExample8() throws Exception {
-                doTestAndroidGradle("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_before.gradle");
+                doTestAndroidGradle(fileName);
             }
             
         }
@@ -153,6 +176,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
     }
     
     @TestMetadata("idea/testData/configuration/gradle")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Gradle extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInGradle() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true);
@@ -160,17 +184,20 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         
         @TestMetadata("default_before.gradle")
         public void testDefault() throws Exception {
-            doTestGradle("idea/testData/configuration/gradle/default_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/default_before.gradle");
+            doTestGradle(fileName);
         }
         
         @TestMetadata("missedLibrary_before.gradle")
         public void testMissedLibrary() throws Exception {
-            doTestGradle("idea/testData/configuration/gradle/missedLibrary_before.gradle");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/gradle/missedLibrary_before.gradle");
+            doTestGradle(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/configuration/maven")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Maven extends AbstractConfigureProjectByChangingFileTest {
         public void testAllFilesPresentInMaven() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false);
@@ -178,22 +205,26 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu
         
         @TestMetadata("libraryMissed")
         public void testLibraryMissed() throws Exception {
-            doTestWithMaven("idea/testData/configuration/maven/libraryMissed/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/libraryMissed/");
+            doTestWithMaven(fileName);
         }
         
         @TestMetadata("pluginMissed")
         public void testPluginMissed() throws Exception {
-            doTestWithMaven("idea/testData/configuration/maven/pluginMissed/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/pluginMissed/");
+            doTestWithMaven(fileName);
         }
         
         @TestMetadata("simpleProject")
         public void testSimpleProject() throws Exception {
-            doTestWithMaven("idea/testData/configuration/maven/simpleProject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProject/");
+            doTestWithMaven(fileName);
         }
         
         @TestMetadata("simpleProjectSnapshot")
         public void testSimpleProjectSnapshot() throws Exception {
-            doTestWithMaven("idea/testData/configuration/maven/simpleProjectSnapshot/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/configuration/maven/simpleProjectSnapshot/");
+            doTestWithMaven(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
index 9aff6fab25f..57f9048dd9b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.conversion.copy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/copyPaste/conversion")
+@TestDataPath("$PROJECT_ROOT")
 public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest {
     public void testAllFilesPresentInConversion() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^(.+)\\.java$"), true);
@@ -35,72 +37,86 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
     
     @TestMetadata("Arithmetic.java")
     public void testArithmetic() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Arithmetic.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Arithmetic.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Constructor.java")
     public void testConstructor() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Constructor.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Constructor.java");
+        doTest(fileName);
     }
     
     @TestMetadata("HalfTheWhiteSpace.java")
     public void testHalfTheWhiteSpace() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/HalfTheWhiteSpace.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Imports1.java")
     public void testImports1() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Imports1.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Imports2.java")
     public void testImports2() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Imports2.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports2.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Imports3.java")
     public void testImports3() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Imports3.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports3.java");
+        doTest(fileName);
     }
     
     @TestMetadata("Indentation.java")
     public void testIndentation() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/Indentation.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Indentation.java");
+        doTest(fileName);
     }
     
     @TestMetadata("MethodReferenceWithoutQualifier.java")
     public void testMethodReferenceWithoutQualifier() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/MethodReferenceWithoutQualifier.java");
+        doTest(fileName);
     }
     
     @TestMetadata("OnlyClosingBrace.java")
     public void testOnlyClosingBrace() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyClosingBrace.java");
+        doTest(fileName);
     }
     
     @TestMetadata("OnlyOneBraceFromBlock.java")
     public void testOnlyOneBraceFromBlock() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyOneBraceFromBlock.java");
+        doTest(fileName);
     }
     
     @TestMetadata("OnlyQualifier.java")
     public void testOnlyQualifier() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/OnlyQualifier.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/OnlyQualifier.java");
+        doTest(fileName);
     }
     
     @TestMetadata("SampleBlock.java")
     public void testSampleBlock() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/SampleBlock.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SampleBlock.java");
+        doTest(fileName);
     }
     
     @TestMetadata("SeveralMethodsSample.java")
     public void testSeveralMethodsSample() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SeveralMethodsSample.java");
+        doTest(fileName);
     }
     
     @TestMetadata("SingleWordFromIdentifier.java")
     public void testSingleWordFromIdentifier() throws Exception {
-        doTest("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/SingleWordFromIdentifier.java");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
index 2b4f1a7a3a7..7eac75e35ac 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlinSteppingTestGenerated.StepInto.class, KotlinSteppingTestGenerated.SmartStepInto.class, KotlinSteppingTestGenerated.Filters.class})
 public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
     @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInStepInto() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,72 +39,86 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
         
         @TestMetadata("classObjectFunFromClass.kt")
         public void testClassObjectFunFromClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("classObjectFunFromTopLevel.kt")
         public void testClassObjectFunFromTopLevel() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("extFun.kt")
         public void testExtFun() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("javaFun.kt")
         public void testJavaFun() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("memberFunFromClass.kt")
         public void testMemberFunFromClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("memberFunFromTopLevel.kt")
         public void testMemberFunFromTopLevel() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("memberGetterFromClass.kt")
         public void testMemberGetterFromClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("memberGetterFromTopLevel.kt")
         public void testMemberGetterFromTopLevel() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("objectFun.kt")
         public void testObjectFun() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelFunFromClass.kt")
         public void testTopLevelFunFromClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelFunFromTopLevel.kt")
         public void testTopLevelFunFromTopLevel() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelGetterFromClass.kt")
         public void testTopLevelGetterFromClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelGetterFromTopLevel.kt")
         public void testTopLevelGetterFromTopLevel() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            doStepIntoTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SmartStepInto extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInSmartStepInto() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -110,72 +126,86 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
         
         @TestMetadata("classObjectFunFromClass.kt")
         public void testClassObjectFunFromClass() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromClass.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("classObjectFunFromTopLevel.kt")
         public void testClassObjectFunFromTopLevel() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/classObjectFunFromTopLevel.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("extFun.kt")
         public void testExtFun() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/extFun.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("javaFun.kt")
         public void testJavaFun() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/javaFun.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("memberFunFromClass.kt")
         public void testMemberFunFromClass() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromClass.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("memberFunFromTopLevel.kt")
         public void testMemberFunFromTopLevel() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberFunFromTopLevel.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("memberGetterFromClass.kt")
         public void testMemberGetterFromClass() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromClass.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("memberGetterFromTopLevel.kt")
         public void testMemberGetterFromTopLevel() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/memberGetterFromTopLevel.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("objectFun.kt")
         public void testObjectFun() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/objectFun.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelFunFromClass.kt")
         public void testTopLevelFunFromClass() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromClass.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelFunFromTopLevel.kt")
         public void testTopLevelFunFromTopLevel() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelFunFromTopLevel.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelGetterFromClass.kt")
         public void testTopLevelGetterFromClass() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromClass.kt");
+            doSmartStepIntoTest(fileName);
         }
         
         @TestMetadata("topLevelGetterFromTopLevel.kt")
         public void testTopLevelGetterFromTopLevel() throws Exception {
-            doSmartStepIntoTest("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/stepInto/topLevelGetterFromTopLevel.kt");
+            doSmartStepIntoTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/filters")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Filters extends AbstractKotlinSteppingTest {
         public void testAllFilesPresentInFilters() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/filters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -183,52 +213,62 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
         
         @TestMetadata("checkNotNull.kt")
         public void testCheckNotNull() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/checkNotNull.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("doNotSkipClassloader.kt")
         public void testDoNotSkipClassloader() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/doNotSkipClassloader.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("doNotSkipConstructors.kt")
         public void testDoNotSkipConstructors() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("npe.kt")
         public void testNpe() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/npe.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/npe.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("reflectKClass.kt")
         public void testReflectKClass() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/reflectKClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/reflectKClass.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("skipClassloader.kt")
         public void testSkipClassloader() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/skipClassloader.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/skipClassloader.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("skipConstructors.kt")
         public void testSkipConstructors() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("stdlibStep.kt")
         public void testStdlibStep() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("stepIntoSpecificKotlinClasses.kt")
         public void testStepIntoSpecificKotlinClasses() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stepIntoSpecificKotlinClasses.kt");
+            doStepIntoTest(fileName);
         }
         
         @TestMetadata("stepIntoStdlib.kt")
         public void testStepIntoStdlib() throws Exception {
-            doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/filters/stepIntoStdlib.kt");
+            doStepIntoTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java
index ff1b484b373..03cff5fdf0f 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/debugger/smartStepInto")
+@TestDataPath("$PROJECT_ROOT")
 public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest {
     public void testAllFilesPresentInSmartStepInto() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,127 +37,152 @@ public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest {
     
     @TestMetadata("annotation.kt")
     public void testAnnotation() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/annotation.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/annotation.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("arrayAccess.kt")
     public void testArrayAccess() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/arrayAccess.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/arrayAccess.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("callChain.kt")
     public void testCallChain() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/callChain.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/callChain.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("conventionMethod.kt")
     public void testConventionMethod() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/conventionMethod.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/conventionMethod.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("delegatedPropertyGetter.kt")
     public void testDelegatedPropertyGetter() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/delegatedPropertyGetter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("doWhile.kt")
     public void testDoWhile() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/doWhile.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/doWhile.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("dotQualified.kt")
     public void testDotQualified() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/dotQualified.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualified.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("dotQualifiedInParam.kt")
     public void testDotQualifiedInParam() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/dotQualifiedInParam.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("empty.kt")
     public void testEmpty() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/empty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/empty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("for.kt")
     public void testFor() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/for.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/for.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("funLiteral.kt")
     public void testFunLiteral() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/funLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/funLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("if.kt")
     public void testIf() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/if.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/if.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("infixCall.kt")
     public void testInfixCall() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/infixCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/infixCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("invoke.kt")
     public void testInvoke() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/invoke.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/invoke.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("multiline.kt")
     public void testMultiline() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/multiline.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multiline.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("multilineCallChain.kt")
     public void testMultilineCallChain() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/multilineCallChain.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/multilineCallChain.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("object.kt")
     public void testObject() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/object.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/object.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("param.kt")
     public void testParam() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/param.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/param.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("parantesized.kt")
     public void testParantesized() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/parantesized.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/parantesized.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("propertyGetter.kt")
     public void testPropertyGetter() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/propertyGetter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/propertyGetter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/simple.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/simple.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("stringTemplate.kt")
     public void testStringTemplate() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/stringTemplate.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/stringTemplate.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("unary.kt")
     public void testUnary() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/unary.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/unary.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("when.kt")
     public void testWhen() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/when.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/when.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("while.kt")
     public void testWhile() throws Exception {
-        doTest("idea/testData/debugger/smartStepInto/while.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/smartStepInto/while.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java
index 23d2c5bbadd..09f1427d233 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/completion/basic/codeFragments")
+@TestDataPath("$PROJECT_ROOT")
 public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest {
     public void testAllFilesPresentInCodeFragments() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,17 +37,20 @@ public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCom
     
     @TestMetadata("blockCodeFragment.kt")
     public void testBlockCodeFragment() throws Exception {
-        doTest("idea/testData/completion/basic/codeFragments/blockCodeFragment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/codeFragments/blockCodeFragment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localVal.kt")
     public void testLocalVal() throws Exception {
-        doTest("idea/testData/completion/basic/codeFragments/localVal.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/codeFragments/localVal.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevel.kt")
     public void testTopLevel() throws Exception {
-        doTest("idea/testData/completion/basic/codeFragments/topLevel.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/completion/basic/codeFragments/topLevel.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java
index a6128e8f109..cb6c28723d5 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({CodeFragmentHighlightingTestGenerated.CodeFragments.class, CodeFragmentHighlightingTestGenerated.Imports.class})
 public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentHighlightingTest {
     @TestMetadata("idea/testData/checker/codeFragments")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CodeFragments extends AbstractCodeFragmentHighlightingTest {
         public void testAllFilesPresentInCodeFragments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -37,57 +39,68 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
         
         @TestMetadata("binaryExpression.kt")
         public void testBinaryExpression() throws Exception {
-            doTest("idea/testData/checker/codeFragments/binaryExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/binaryExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("blockCodeFragment.kt")
         public void testBlockCodeFragment() throws Exception {
-            doTest("idea/testData/checker/codeFragments/blockCodeFragment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/blockCodeFragment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("callExpression.kt")
         public void testCallExpression() throws Exception {
-            doTest("idea/testData/checker/codeFragments/callExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/callExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("contextElementAsStatement.kt")
         public void testContextElementAsStatement() throws Exception {
-            doTest("idea/testData/checker/codeFragments/contextElementAsStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/contextElementAsStatement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateFunArgumentsResolve.kt")
         public void testPrivateFunArgumentsResolve() throws Exception {
-            doTest("idea/testData/checker/codeFragments/privateFunArgumentsResolve.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateFunArgumentsResolve.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateFunTypeArguments.kt")
         public void testPrivateFunTypeArguments() throws Exception {
-            doTest("idea/testData/checker/codeFragments/privateFunTypeArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateFunTypeArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("privateMember.kt")
         public void testPrivateMember() throws Exception {
-            doTest("idea/testData/checker/codeFragments/privateMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/privateMember.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("protectedMember.kt")
         public void testProtectedMember() throws Exception {
-            doTest("idea/testData/checker/codeFragments/protectedMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/protectedMember.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleNameExpression.kt")
         public void testSimpleNameExpression() throws Exception {
-            doTest("idea/testData/checker/codeFragments/simpleNameExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/simpleNameExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("smartCasts.kt")
         public void testSmartCasts() throws Exception {
-            doTest("idea/testData/checker/codeFragments/smartCasts.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/smartCasts.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/checker/codeFragments/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Imports extends AbstractCodeFragmentHighlightingTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments/imports"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -95,7 +108,8 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH
         
         @TestMetadata("hashMap.kt")
         public void testHashMap() throws Exception {
-            doTestWithImport("idea/testData/checker/codeFragments/imports/hashMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/checker/codeFragments/imports/hashMap.kt");
+            doTestWithImport(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
index 7a7aac57892..cdafd4cf4c0 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,11 +31,13 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class})
 public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest {
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({SingleBreakpoint.Frame.class})
     public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest {
         @TestMetadata("abstractFunCall.kt")
         public void testAbstractFunCall() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/abstractFunCall.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         public void testAllFilesPresentInSingleBreakpoint() throws Exception {
@@ -43,105 +46,126 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
         
         @TestMetadata("arrays.kt")
         public void testArrays() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/arrays.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("classFromAnotherPackage.kt")
         public void testClassFromAnotherPackage() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classFromAnotherPackage.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("classObjectVal.kt")
         public void testClassObjectVal() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/classObjectVal.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("collections.kt")
         public void testCollections() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/collections.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("dependentOnFile.kt")
         public void testDependentOnFile() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/dependentOnFile.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("doubles.kt")
         public void testDoubles() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/doubles.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("enums.kt")
         public void testEnums() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/enums.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("errors.kt")
         public void testErrors() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/errors.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("extractLocalVariables.kt")
         public void testExtractLocalVariables() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractLocalVariables.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("extractThis.kt")
         public void testExtractThis() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractThis.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("extractVariablesFromCall.kt")
         public void testExtractVariablesFromCall() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/extractVariablesFromCall.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/imports.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("insertInBlock.kt")
         public void testInsertInBlock() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/insertInBlock.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("multilineExpressionAtBreakpoint.kt")
         public void testMultilineExpressionAtBreakpoint() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/multilineExpressionAtBreakpoint.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("privateMember.kt")
         public void testPrivateMember() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/privateMember.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("protectedMember.kt")
         public void testProtectedMember() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/protectedMember.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/simple.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("stdlib.kt")
         public void testStdlib() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/stdlib.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("vars.kt")
         public void testVars() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/vars.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata(".kt.kt")
         public void test_kt() throws Exception {
-            doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/.kt.kt");
+            doSingleBreakpointTest(fileName);
         }
         
         @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Frame extends AbstractKotlinEvaluateExpressionTest {
             public void testAllFilesPresentInFrame() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -149,72 +173,86 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             
             @TestMetadata("frameAnonymousObject.kt")
             public void testFrameAnonymousObject() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameAnonymousObject.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameClassObject.kt")
             public void testFrameClassObject() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameClassObject.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameExtFunExtFun.kt")
             public void testFrameExtFunExtFun() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtFunExtFun.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameExtensionFun.kt")
             public void testFrameExtensionFun() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameExtensionFun.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameInnerClass.kt")
             public void testFrameInnerClass() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerClass.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameInnerLambda.kt")
             public void testFrameInnerLambda() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameInnerLambda.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameLambda.kt")
             public void testFrameLambda() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambda.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameLambdaNotUsed.kt")
             public void testFrameLambdaNotUsed() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameLambdaNotUsed.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameObject.kt")
             public void testFrameObject() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameObject.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameSharedVar.kt")
             public void testFrameSharedVar() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSharedVar.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameSimple.kt")
             public void testFrameSimple() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameSimple.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameThis0.kt")
             public void testFrameThis0() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameThis0Ext.kt")
             public void testFrameThis0Ext() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0Ext.kt");
+                doSingleBreakpointTest(fileName);
             }
             
             @TestMetadata("frameThis0This0.kt")
             public void testFrameThis0This0() throws Exception {
-                doSingleBreakpointTest("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame/frameThis0This0.kt");
+                doSingleBreakpointTest(fileName);
             }
             
         }
@@ -228,6 +266,7 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
     }
     
     @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({MultipleBreakpoints.Library.class})
     public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest {
         public void testAllFilesPresentInMultipleBreakpoints() throws Exception {
@@ -236,35 +275,42 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
         
         @TestMetadata("clearCache.kt")
         public void testClearCache() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/clearCache.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("exceptions.kt")
         public void testExceptions() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/exceptions.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("whenEntry.kt")
         public void testWhenEntry() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/whenEntry.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("withoutBodyFunctions.kt")
         public void testWithoutBodyFunctions() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyFunctions.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("withoutBodyProperties.kt")
         public void testWithoutBodyProperties() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("withoutBodyTypeParameters.kt")
         public void testWithoutBodyTypeParameters() throws Exception {
-            doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyTypeParameters.kt");
+            doMultipleBreakpointsTest(fileName);
         }
         
         @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Library extends AbstractKotlinEvaluateExpressionTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -272,22 +318,26 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
             
             @TestMetadata("customLibClassName.kt")
             public void testCustomLibClassName() throws Exception {
-                doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/customLibClassName.kt");
+                doMultipleBreakpointsTest(fileName);
             }
             
             @TestMetadata("stdlibDelegatedProperty.kt")
             public void testStdlibDelegatedProperty() throws Exception {
-                doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibDelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibDelegatedProperty.kt");
+                doMultipleBreakpointsTest(fileName);
             }
             
             @TestMetadata("stdlibRange.kt")
             public void testStdlibRange() throws Exception {
-                doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibRange.kt");
+                doMultipleBreakpointsTest(fileName);
             }
             
             @TestMetadata("stdlibSlice.kt")
             public void testStdlibSlice() throws Exception {
-                doMultipleBreakpointsTest("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibSlice.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library/stdlibSlice.kt");
+                doMultipleBreakpointsTest(fileName);
             }
             
         }
diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java
index 1cbb4a0103d..4998002e8c5 100644
--- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.debugger.evaluate;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/debugger/selectExpression")
+@TestDataPath("$PROJECT_ROOT")
 public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpressionForDebuggerTest {
     public void testAllFilesPresentInSelectExpression() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,142 +37,170 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr
     
     @TestMetadata("annotation.kt")
     public void testAnnotation() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/annotation.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/annotation.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("binaryExpression.kt")
     public void testBinaryExpression() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/binaryExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/binaryExpression.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("call.kt")
     public void testCall() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/call.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/call.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("expressionInPropertyInitializer.kt")
     public void testExpressionInPropertyInitializer() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/expressionInPropertyInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("extensionFun.kt")
     public void testExtensionFun() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/extensionFun.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/extensionFun.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("funArgument.kt")
     public void testFunArgument() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/funArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/funArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("functionLiteral.kt")
     public void testFunctionLiteral() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/functionLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/functionLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("getConvention.kt")
     public void testGetConvention() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/getConvention.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/getConvention.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("imports.kt")
     public void testImports() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/imports.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/imports.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("infixCall.kt")
     public void testInfixCall() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/infixCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("infixCallArgument.kt")
     public void testInfixCallArgument() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/infixCallArgument.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/infixCallArgument.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("isExpression.kt")
     public void testIsExpression() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/isExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/isExpression.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("keyword.kt")
     public void testKeyword() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/keyword.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/keyword.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("modifier.kt")
     public void testModifier() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/modifier.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/modifier.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("package.kt")
     public void testPackage() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/package.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/package.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("param.kt")
     public void testParam() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/param.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/param.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("propertyCall.kt")
     public void testPropertyCall() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/propertyCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("propertyDeclaration.kt")
     public void testPropertyDeclaration() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/propertyDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/propertyDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("qualifiedExpressionProperty.kt")
     public void testQualifiedExpressionProperty() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("qualifiedExpressionReceiver.kt")
     public void testQualifiedExpressionReceiver() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionReceiver.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("qualifiedExpressionSelector.kt")
     public void testQualifiedExpressionSelector() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/qualifiedExpressionSelector.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("super.kt")
     public void testSuper() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/super.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/super.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("this.kt")
     public void testThis() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/this.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/this.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("thisWithLabel.kt")
     public void testThisWithLabel() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/thisWithLabel.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/thisWithLabel.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("unaryExpression.kt")
     public void testUnaryExpression() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/unaryExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/unaryExpression.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("userType.kt")
     public void testUserType() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/userType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("userTypeGeneric.kt")
     public void testUserTypeGeneric() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/userTypeGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("userTypeQualified.kt")
     public void testUserTypeQualified() throws Exception {
-        doTest("idea/testData/debugger/selectExpression/userTypeQualified.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/userTypeQualified.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java
index 4d379c4c37f..53bbf29338e 100644
--- a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.folding;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlinFoldingTestGenerated.NoCollapse.class, KotlinFoldingTestGenerated.CheckCollapse.class})
 public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
     @TestMetadata("idea/testData/folding/noCollapse")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NoCollapse extends AbstractKotlinFoldingTest {
         public void testAllFilesPresentInNoCollapse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,42 +39,50 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
         
         @TestMetadata("class.kt")
         public void testClass() throws Exception {
-            doTest("idea/testData/folding/noCollapse/class.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("function.kt")
         public void testFunction() throws Exception {
-            doTest("idea/testData/folding/noCollapse/function.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/function.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            doTest("idea/testData/folding/noCollapse/imports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/imports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("kdocComments.kt")
         public void testKdocComments() throws Exception {
-            doTest("idea/testData/folding/noCollapse/kdocComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/kdocComments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineComments.kt")
         public void testMultilineComments() throws Exception {
-            doTest("idea/testData/folding/noCollapse/multilineComments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/multilineComments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("object.kt")
         public void testObject() throws Exception {
-            doTest("idea/testData/folding/noCollapse/object.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/object.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("oneImport.kt")
         public void testOneImport() throws Exception {
-            doTest("idea/testData/folding/noCollapse/oneImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/noCollapse/oneImport.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/folding/checkCollapse")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CheckCollapse extends AbstractKotlinFoldingTest {
         public void testAllFilesPresentInCheckCollapse() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -80,17 +90,20 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
         
         @TestMetadata("headerKDoc.kt")
         public void testHeaderKDoc() throws Exception {
-            doSettingsFoldingTest("idea/testData/folding/checkCollapse/headerKDoc.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerKDoc.kt");
+            doSettingsFoldingTest(fileName);
         }
         
         @TestMetadata("headerMultilineComment.kt")
         public void testHeaderMultilineComment() throws Exception {
-            doSettingsFoldingTest("idea/testData/folding/checkCollapse/headerMultilineComment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/headerMultilineComment.kt");
+            doSettingsFoldingTest(fileName);
         }
         
         @TestMetadata("imports.kt")
         public void testImports() throws Exception {
-            doSettingsFoldingTest("idea/testData/folding/checkCollapse/imports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/folding/checkCollapse/imports.kt");
+            doSettingsFoldingTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java
index 68a49584b66..f55e1c73cff 100644
--- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.hierarchy;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({HierarchyTestGenerated.Type.class, HierarchyTestGenerated.Super.class, HierarchyTestGenerated.Sub.class, HierarchyTestGenerated.Callers.class, HierarchyTestGenerated.Callees.class, HierarchyTestGenerated.Overrides.class})
 public class HierarchyTestGenerated extends AbstractHierarchyTest {
     @TestMetadata("idea/testData/hierarchy/class/type")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Type extends AbstractHierarchyTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false);
@@ -37,142 +39,170 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("CaretAtAnnotation")
         public void testCaretAtAnnotation() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtAnnotation/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtAnnotation/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtConstructor")
         public void testCaretAtConstructor() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtConstructor/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtConstructor/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtFabricMethod")
         public void testCaretAtFabricMethod() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtFabricMethod/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtFabricMethod/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtImport")
         public void testCaretAtImport() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtImport/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtImport/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtJavaType")
         public void testCaretAtJavaType() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtJavaType/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtJavaType/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtModifierList")
         public void testCaretAtModifierList() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtModifierList/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtModifierList/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtReceiverExtFun")
         public void testCaretAtReceiverExtFun() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtReceiverExtFun/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtSuperCall")
         public void testCaretAtSuperCall() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSuperCall/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSuperCall/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtSupertypesList")
         public void testCaretAtSupertypesList() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtSupertypesList/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtSupertypesList/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretAtTypeReference")
         public void testCaretAtTypeReference() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretAtTypeReference/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretAtTypeReference/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("CaretInClassBody")
         public void testCaretInClassBody() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/CaretInClassBody/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/CaretInClassBody/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassFromClass")
         public void testClassFromClass() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromClass/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassFromObject")
         public void testClassFromObject() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassFromObject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassFromObject/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassInClassObject")
         public void testClassInClassObject() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInClassObject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInClassObject/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassInPackage")
         public void testClassInPackage() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/ClassInPackage/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/ClassInPackage/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("InnerClass")
         public void testInnerClass() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/InnerClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/InnerClass/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("JKJHierarchy")
         public void testJKJHierarchy() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JKJHierarchy/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JKJHierarchy/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("JavaFromKotlin")
         public void testJavaFromKotlin() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlin/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlin/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("JavaFromKotlinByRef")
         public void testJavaFromKotlinByRef() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinByRef/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("JavaFromKotlinForKotlinClass")
         public void testJavaFromKotlinForKotlinClass() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JavaFromKotlinForKotlinClass/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("JetInt")
         public void testJetInt() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/JetInt/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/JetInt/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("KJKHierarchy")
         public void testKJKHierarchy() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KJKHierarchy/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KJKHierarchy/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("KotlinFromJava")
         public void testKotlinFromJava() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJava/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJava/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("KotlinFromJavaByRef")
         public void testKotlinFromJavaByRef() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromJavaByRef/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("KotlinFromKotlinByRef")
         public void testKotlinFromKotlinByRef() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/KotlinFromKotlinByRef/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("Object")
         public void testObject() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/Object/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/Object/");
+            doTypeClassHierarchyTest(fileName);
         }
         
         @TestMetadata("TwoChildren")
         public void testTwoChildren() throws Exception {
-            doTypeClassHierarchyTest("idea/testData/hierarchy/class/type/TwoChildren/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/type/TwoChildren/");
+            doTypeClassHierarchyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/hierarchy/class/super")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Super extends AbstractHierarchyTest {
         public void testAllFilesPresentInSuper() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false);
@@ -180,17 +210,20 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("JetList")
         public void testJetList() throws Exception {
-            doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/JetList/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/JetList/");
+            doSuperClassHierarchyTest(fileName);
         }
         
         @TestMetadata("TwoTraits")
         public void testTwoTraits() throws Exception {
-            doSuperClassHierarchyTest("idea/testData/hierarchy/class/super/TwoTraits/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/super/TwoTraits/");
+            doSuperClassHierarchyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/hierarchy/class/sub")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Sub extends AbstractHierarchyTest {
         public void testAllFilesPresentInSub() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false);
@@ -198,47 +231,56 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("AllFromClass")
         public void testAllFromClass() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromClass/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("AllFromTrait")
         public void testAllFromTrait() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/AllFromTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/AllFromTrait/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassFromClass")
         public void testClassFromClass() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromClass/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ClassFromTrait")
         public void testClassFromTrait() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ClassFromTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ClassFromTrait/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ObjectFromClass")
         public void testObjectFromClass() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromClass/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("ObjectFromTrait")
         public void testObjectFromTrait() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/ObjectFromTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/ObjectFromTrait/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("TraitFromClass")
         public void testTraitFromClass() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromClass/");
+            doSubClassHierarchyTest(fileName);
         }
         
         @TestMetadata("TraitFromTrait")
         public void testTraitFromTrait() throws Exception {
-            doSubClassHierarchyTest("idea/testData/hierarchy/class/sub/TraitFromTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/class/sub/TraitFromTrait/");
+            doSubClassHierarchyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/hierarchy/calls/callers")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Callers extends AbstractHierarchyTest {
         public void testAllFilesPresentInCallers() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false);
@@ -246,77 +288,92 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("javaConstructor")
         public void testJavaConstructor() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaConstructor/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaConstructor/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("javaMethod")
         public void testJavaMethod() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/javaMethod/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/javaMethod/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinClass")
         public void testKotlinClass() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinClass/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinFunction")
         public void testKotlinFunction() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinFunction/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinLocalClass")
         public void testKotlinLocalClass() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalClass/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinLocalFunction")
         public void testKotlinLocalFunction() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinLocalFunction/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinNestedClass")
         public void testKotlinNestedClass() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedClass/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinNestedInnerClass")
         public void testKotlinNestedInnerClass() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinNestedInnerClass/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPackageFunction")
         public void testKotlinPackageFunction() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageFunction/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPackageProperty")
         public void testKotlinPackageProperty() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPackageProperty/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPrivateClass")
         public void testKotlinPrivateClass() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateClass/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPrivateFunction")
         public void testKotlinPrivateFunction() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateFunction/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPrivateProperty")
         public void testKotlinPrivateProperty() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinPrivateProperty/");
+            doCallerHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinProperty")
         public void testKotlinProperty() throws Exception {
-            doCallerHierarchyTest("idea/testData/hierarchy/calls/callers/kotlinProperty/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callers/kotlinProperty/");
+            doCallerHierarchyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/hierarchy/calls/callees")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Callees extends AbstractHierarchyTest {
         public void testAllFilesPresentInCallees() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false);
@@ -324,77 +381,92 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("javaConstructor")
         public void testJavaConstructor() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaConstructor/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaConstructor/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("javaMethod")
         public void testJavaMethod() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/javaMethod/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/javaMethod/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinAnonymousObject")
         public void testKotlinAnonymousObject() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinAnonymousObject/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinClass")
         public void testKotlinClass() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClass/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinClassObject")
         public void testKotlinClassObject() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinClassObject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinClassObject/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinEnumClass")
         public void testKotlinEnumClass() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinEnumClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinEnumClass/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinFunction")
         public void testKotlinFunction() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinFunction/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinLocalClass")
         public void testKotlinLocalClass() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalClass/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinLocalFunction")
         public void testKotlinLocalFunction() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinLocalFunction/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinNestedClass")
         public void testKotlinNestedClass() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinNestedClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinNestedClass/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinObject")
         public void testKotlinObject() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinObject/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinObject/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPackageFunction")
         public void testKotlinPackageFunction() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageFunction/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPackageProperty")
         public void testKotlinPackageProperty() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinPackageProperty/");
+            doCalleeHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinProperty")
         public void testKotlinProperty() throws Exception {
-            doCalleeHierarchyTest("idea/testData/hierarchy/calls/callees/kotlinProperty/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/calls/callees/kotlinProperty/");
+            doCalleeHierarchyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/hierarchy/overrides")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Overrides extends AbstractHierarchyTest {
         public void testAllFilesPresentInOverrides() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), false);
@@ -402,32 +474,38 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest {
         
         @TestMetadata("javaMethodInClass")
         public void testJavaMethodInClass() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInClass/");
+            doOverrideHierarchyTest(fileName);
         }
         
         @TestMetadata("javaMethodInInterface")
         public void testJavaMethodInInterface() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/javaMethodInInterface/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/javaMethodInInterface/");
+            doOverrideHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinFunctionInClass")
         public void testKotlinFunctionInClass() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInClass/");
+            doOverrideHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinFunctionInTrait")
         public void testKotlinFunctionInTrait() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinFunctionInTrait/");
+            doOverrideHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPropertyInClass")
         public void testKotlinPropertyInClass() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInClass/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInClass/");
+            doOverrideHierarchyTest(fileName);
         }
         
         @TestMetadata("kotlinPropertyInTrait")
         public void testKotlinPropertyInTrait() throws Exception {
-            doOverrideHierarchyTest("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/hierarchy/overrides/kotlinPropertyInTrait/");
+            doOverrideHierarchyTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java
index 00e4e133a3f..d3c89173301 100644
--- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.highlighter;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/diagnosticMessage")
+@TestDataPath("$PROJECT_ROOT")
 public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTest {
     public void testAllFilesPresentInDiagnosticMessage() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,132 +37,158 @@ public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTes
     
     @TestMetadata("assignedButNeverAccessedVariable.kt")
     public void testAssignedButNeverAccessedVariable() throws Exception {
-        doTest("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/assignedButNeverAccessedVariable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("cannotInferVisibility.kt")
     public void testCannotInferVisibility() throws Exception {
-        doTest("idea/testData/diagnosticMessage/cannotInferVisibility.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotInferVisibility.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("cannotOverrideInvisibleMember.kt")
     public void testCannotOverrideInvisibleMember() throws Exception {
-        doTest("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/cannotOverrideInvisibleMember.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("conflictingOverloadsClass.kt")
     public void testConflictingOverloadsClass() throws Exception {
-        doTest("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("conflictingOverloadsDefaultPackage.kt")
     public void testConflictingOverloadsDefaultPackage() throws Exception {
-        doTest("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingOverloadsDefaultPackage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("conflictingSubstitutions.kt")
     public void testConflictingSubstitutions() throws Exception {
-        doTest("idea/testData/diagnosticMessage/conflictingSubstitutions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/conflictingSubstitutions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("differentNamesForSameParameter.kt")
     public void testDifferentNamesForSameParameter() throws Exception {
-        doTest("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/differentNamesForSameParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("extensionInClassReference.kt")
     public void testExtensionInClassReference() throws Exception {
-        doTest("idea/testData/diagnosticMessage/extensionInClassReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/extensionInClassReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("functionPlaceholder.kt")
     public void testFunctionPlaceholder() throws Exception {
-        doTest("idea/testData/diagnosticMessage/functionPlaceholder.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/functionPlaceholder.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inaccessibleOuterClassExpression.kt")
     public void testInaccessibleOuterClassExpression() throws Exception {
-        doTest("idea/testData/diagnosticMessage/inaccessibleOuterClassExpression.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/inaccessibleOuterClassExpression.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("invisibleMember.kt")
     public void testInvisibleMember() throws Exception {
-        doTest("idea/testData/diagnosticMessage/invisibleMember.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/invisibleMember.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("multipleDefaultsFromSupertypes.kt")
     public void testMultipleDefaultsFromSupertypes() throws Exception {
-        doTest("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/multipleDefaultsFromSupertypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("nameInConstraintIsNotATypeParameter.kt")
     public void testNameInConstraintIsNotATypeParameter() throws Exception {
-        doTest("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nameInConstraintIsNotATypeParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("nestedClassAcessedViaInstanceReference.kt")
     public void testNestedClassAcessedViaInstanceReference() throws Exception {
-        doTest("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassAcessedViaInstanceReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("nestedClassShouldBeQualified.kt")
     public void testNestedClassShouldBeQualified() throws Exception {
-        doTest("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/nestedClassShouldBeQualified.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noneApplicable.kt")
     public void testNoneApplicable() throws Exception {
-        doTest("idea/testData/diagnosticMessage/noneApplicable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noneApplicableGeneric.kt")
     public void testNoneApplicableGeneric() throws Exception {
-        doTest("idea/testData/diagnosticMessage/noneApplicableGeneric.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/noneApplicableGeneric.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("numberValueTypes.kt")
     public void testNumberValueTypes() throws Exception {
-        doTest("idea/testData/diagnosticMessage/numberValueTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/numberValueTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("renderCollectionOfTypes.kt")
     public void testRenderCollectionOfTypes() throws Exception {
-        doTest("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/renderCollectionOfTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("typeInferenceExpectedTypeMismatch.kt")
     public void testTypeInferenceExpectedTypeMismatch() throws Exception {
-        doTest("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceExpectedTypeMismatch.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("typeMismatchWithNothing.kt")
     public void testTypeMismatchWithNothing() throws Exception {
-        doTest("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeMismatchWithNothing.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("unusedParameter.kt")
     public void testUnusedParameter() throws Exception {
-        doTest("idea/testData/diagnosticMessage/unusedParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("unusedValue.kt")
     public void testUnusedValue() throws Exception {
-        doTest("idea/testData/diagnosticMessage/unusedValue.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedValue.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("unusedVariable.kt")
     public void testUnusedVariable() throws Exception {
-        doTest("idea/testData/diagnosticMessage/unusedVariable.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/unusedVariable.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("upperBoundViolated.kt")
     public void testUpperBoundViolated() throws Exception {
-        doTest("idea/testData/diagnosticMessage/upperBoundViolated.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/upperBoundViolated.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("wrongReturnTypeInImplementation.kt")
     public void testWrongReturnTypeInImplementation() throws Exception {
-        doTest("idea/testData/diagnosticMessage/wrongReturnTypeInImplementation.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/diagnosticMessage/wrongReturnTypeInImplementation.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java
index 5685493c76c..eb65832b90d 100644
--- a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.highlighter;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/highlighter")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({HighlightingTestGenerated.Deprecated.class})
 public class HighlightingTestGenerated extends AbstractHighlightingTest {
     public void testAllFilesPresentInHighlighter() throws Exception {
@@ -36,40 +38,48 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest {
     
     @TestMetadata("Enums.kt")
     public void testEnums() throws Exception {
-        doTest("idea/testData/highlighter/Enums.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Enums.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Functions.kt")
     public void testFunctions() throws Exception {
-        doTest("idea/testData/highlighter/Functions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Functions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaTypes.kt")
     public void testJavaTypes() throws Exception {
-        doTest("idea/testData/highlighter/JavaTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/JavaTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Object.kt")
     public void testObject() throws Exception {
-        doTest("idea/testData/highlighter/Object.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Object.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TypesAndAnnotations.kt")
     public void testTypesAndAnnotations() throws Exception {
-        doTest("idea/testData/highlighter/TypesAndAnnotations.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/TypesAndAnnotations.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Variables.kt")
     public void testVariables() throws Exception {
-        doTest("idea/testData/highlighter/Variables.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/Variables.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("VariablesAsFunctions.kt")
     public void testVariablesAsFunctions() throws Exception {
-        doTest("idea/testData/highlighter/VariablesAsFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/VariablesAsFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("idea/testData/highlighter/deprecated")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Deprecated extends AbstractHighlightingTest {
         public void testAllFilesPresentInDeprecated() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -77,72 +87,86 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest {
         
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Class.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/ClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Function.kt")
         public void testFunction() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Function.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Function.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Get.kt")
         public void testGet() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Get.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Get.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Getter.kt")
         public void testGetter() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Getter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Getter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Inc.kt")
         public void testInc() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Inc.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Inc.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Invalid.kt")
         public void testInvalid() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Invalid.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invalid.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Invoke.kt")
         public void testInvoke() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Invoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Invoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Operation.kt")
         public void testOperation() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Operation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Operation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Property.kt")
         public void testProperty() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Property.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Property.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RangeTo.kt")
         public void testRangeTo() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/RangeTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/RangeTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Setter.kt")
         public void testSetter() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Setter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Setter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SuperCall.kt")
         public void testSuperCall() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/SuperCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/SuperCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTest("idea/testData/highlighter/deprecated/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/highlighter/deprecated/Trait.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
index c01cad44e6f..1c67b254d49 100644
--- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.imports;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/editor/optimizeImports")
+@TestDataPath("$PROJECT_ROOT")
 public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
     public void testAllFilesPresentInOptimizeImports() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)$"), false);
@@ -35,107 +37,128 @@ public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
     
     @TestMetadata("AlreadyOptimized")
     public void testAlreadyOptimized() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/AlreadyOptimized/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/AlreadyOptimized/");
+        doTest(fileName);
     }
     
     @TestMetadata("ArrayAccessExpression")
     public void testArrayAccessExpression() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/ArrayAccessExpression/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ArrayAccessExpression/");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassMemberImported")
     public void testClassMemberImported() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/ClassMemberImported/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ClassMemberImported/");
+        doTest(fileName);
     }
     
     @TestMetadata("ComponentFunction")
     public void testComponentFunction() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/ComponentFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/ComponentFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("DefaultJsImports")
     public void testDefaultJsImports() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/DefaultJsImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DefaultJsImports/");
+        doTest(fileName);
     }
     
     @TestMetadata("DuplicatedImports")
     public void testDuplicatedImports() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/DuplicatedImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/DuplicatedImports/");
+        doTest(fileName);
     }
     
     @TestMetadata("Enums")
     public void testEnums() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/Enums/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Enums/");
+        doTest(fileName);
     }
     
     @TestMetadata("InvokeFunction")
     public void testInvokeFunction() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/InvokeFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/InvokeFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("IteratorFunction")
     public void testIteratorFunction() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/IteratorFunction/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/IteratorFunction/");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticField")
     public void testJavaStaticField() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/JavaStaticField/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/JavaStaticField/");
+        doTest(fileName);
     }
     
     @TestMetadata("KotlinPackage")
     public void testKotlinPackage() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/KotlinPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/KotlinPackage/");
+        doTest(fileName);
     }
     
     @TestMetadata("Kt1850FullQualified")
     public void testKt1850FullQualified() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/Kt1850FullQualified/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850FullQualified/");
+        doTest(fileName);
     }
     
     @TestMetadata("Kt1850InnerClass")
     public void testKt1850InnerClass() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/Kt1850InnerClass/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt1850InnerClass/");
+        doTest(fileName);
     }
     
     @TestMetadata("Kt2488EnumEntry")
     public void testKt2488EnumEntry() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/Kt2488EnumEntry/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2488EnumEntry/");
+        doTest(fileName);
     }
     
     @TestMetadata("Kt2709")
     public void testKt2709() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/Kt2709/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/Kt2709/");
+        doTest(fileName);
     }
     
     @TestMetadata("PartiallyQualified")
     public void testPartiallyQualified() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/PartiallyQualified/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/PartiallyQualified/");
+        doTest(fileName);
     }
     
     @TestMetadata("RemoveImportsIfGeneral")
     public void testRemoveImportsIfGeneral() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneral/");
+        doTest(fileName);
     }
     
     @TestMetadata("RemoveImportsIfGeneralBefore")
     public void testRemoveImportsIfGeneralBefore() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/RemoveImportsIfGeneralBefore/");
+        doTest(fileName);
     }
     
     @TestMetadata("SamConstructor")
     public void testSamConstructor() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/SamConstructor/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/SamConstructor/");
+        doTest(fileName);
     }
     
     @TestMetadata("UnusedImports")
     public void testUnusedImports() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/UnusedImports/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/UnusedImports/");
+        doTest(fileName);
     }
     
     @TestMetadata("WithAliases")
     public void testWithAliases() throws Exception {
-        doTest("idea/testData/editor/optimizeImports/WithAliases/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/editor/optimizeImports/WithAliases/");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java
index a7e0bbc45e6..35839835f7c 100644
--- a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.intentions;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/intentions")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({IntentionTestGenerated.AddBraces.class, IntentionTestGenerated.AttributeCallReplacements.class, IntentionTestGenerated.Branched.class, IntentionTestGenerated.ConvertAssertToIf.class, IntentionTestGenerated.ConvertIfToAssert.class, IntentionTestGenerated.ConvertNegatedBooleanSequence.class, IntentionTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, IntentionTestGenerated.ConvertToBlockBody.class, IntentionTestGenerated.ConvertToConcatenatedStringIntention.class, IntentionTestGenerated.ConvertToExpressionBody.class, IntentionTestGenerated.ConvertToForEachFunctionCall.class, IntentionTestGenerated.ConvertToForEachLoop.class, IntentionTestGenerated.ConvertToStringTemplateIntention.class, IntentionTestGenerated.Declarations.class, IntentionTestGenerated.InsertCurlyBracesToTemplate.class, IntentionTestGenerated.InsertExplicitTypeArguments.class, IntentionTestGenerated.InvertIfCondition.class, IntentionTestGenerated.MakeTypeExplicitInLambda.class, IntentionTestGenerated.MakeTypeImplicitInLambda.class, IntentionTestGenerated.MoveLambdaInsideParentheses.class, IntentionTestGenerated.MoveLambdaOutsideParentheses.class, IntentionTestGenerated.OperatorToFunction.class, IntentionTestGenerated.ReconstructedType.class, IntentionTestGenerated.RemoveBraces.class, IntentionTestGenerated.RemoveCurlyBracesFromTemplate.class, IntentionTestGenerated.RemoveExplicitTypeArguments.class, IntentionTestGenerated.RemoveUnnecessaryParentheses.class, IntentionTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, IntentionTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, IntentionTestGenerated.ReplaceWithDotQualifiedMethodCall.class, IntentionTestGenerated.ReplaceWithInfixFunctionCall.class, IntentionTestGenerated.ReplaceWithOperatorAssign.class, IntentionTestGenerated.ReplaceWithTraditionalAssignment.class, IntentionTestGenerated.SimplifyBooleanWithConstants.class, IntentionTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, IntentionTestGenerated.SpecifyType.class, IntentionTestGenerated.SplitIf.class, IntentionTestGenerated.SwapBinaryExpression.class})
 public class IntentionTestGenerated extends AbstractIntentionTest {
     public void testAllFilesPresentInIntentions() throws Exception {
@@ -35,45 +37,54 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/addBraces")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AddBraces extends AbstractIntentionTest {
         @TestMetadata("addBracesForDoWhile.kt")
         public void testAddBracesForDoWhile() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForDoWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForDoWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForElse.kt")
         public void testAddBracesForElse() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForFor.kt")
         public void testAddBracesForFor() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForFor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForFor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForIf.kt")
         public void testAddBracesForIf() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForIfWithNoSpace.kt")
         public void testAddBracesForIfWithNoSpace() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithNoSpace.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForIfWithSemicolon.kt")
         public void testAddBracesForIfWithSemicolon() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForIfWithSemicolon.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesForWhile.kt")
         public void testAddBracesForWhile() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesForWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesForWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("addBracesWithBraces.kt")
         public void testAddBracesWithBraces() throws Exception {
-            doTest("idea/testData/intentions/addBraces/addBracesWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/addBraces/addBracesWithBraces.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInAddBraces() throws Exception {
@@ -83,6 +94,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/attributeCallReplacements")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({AttributeCallReplacements.ReplaceBinaryInfixIntention.class, AttributeCallReplacements.ReplaceContainsIntention.class, AttributeCallReplacements.ReplaceGetIntention.class, AttributeCallReplacements.ReplaceInvokeIntention.class, AttributeCallReplacements.ReplaceUnaryPrefixIntention.class})
     public static class AttributeCallReplacements extends AbstractIntentionTest {
         public void testAllFilesPresentInAttributeCallReplacements() throws Exception {
@@ -90,15 +102,18 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ReplaceBinaryInfixIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg1.kt")
             public void testAcceptableVararg1() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/acceptableVararg1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/acceptableVararg1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("acceptableVararg2.kt")
             public void testAcceptableVararg2() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/acceptableVararg2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/acceptableVararg2.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInReplaceBinaryInfixIntention() throws Exception {
@@ -107,91 +122,109 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("allowableDefaultArgument.kt")
             public void testAllowableDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/allowableDefaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/allowableDefaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("divSanityTest.kt")
             public void testDivSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/divSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/divSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/extensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/extensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgument.kt")
             public void testFunctionLiteralArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/functionLiteralArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/functionLiteralArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("minusSanityTest.kt")
             public void testMinusSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/minusSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/minusSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingDefaultArgument.kt")
             public void testMissingDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/missingDefaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/missingDefaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("modSanityTest.kt")
             public void testModSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/modSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/modSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multipleArguments.kt")
             public void testMultipleArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/multipleArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/multipleArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plusSanityTest.kt")
             public void testPlusSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/plusSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/plusSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rangeToSanityTest.kt")
             public void testRangeToSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/rangeToSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/rangeToSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("timesSanityTest.kt")
             public void testTimesSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/timesSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/timesSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeArguments.kt")
             public void testTypeArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/typeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/typeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg1.kt")
             public void testUnacceptableVararg1() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/unacceptableVararg1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/unacceptableVararg1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg2.kt")
             public void testUnacceptableVararg2() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/unacceptableVararg2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/unacceptableVararg2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("validNamedArgument.kt")
             public void testValidNamedArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/validNamedArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/validNamedArgument.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ReplaceContainsIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/acceptableVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/acceptableVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("acceptableVararg2.kt")
             public void testAcceptableVararg2() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/acceptableVararg2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/acceptableVararg2.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInReplaceContainsIntention() throws Exception {
@@ -200,92 +233,110 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("allowableDefaultArgument.kt")
             public void testAllowableDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/allowableDefaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/allowableDefaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("containsInExpression.kt")
             public void testContainsInExpression() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/containsInExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/containsInExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/extensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/extensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgument.kt")
             public void testFunctionLiteralArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgumentAfterSemicolon.kt")
             public void testFunctionLiteralArgumentAfterSemicolon() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentAfterSemicolon.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgumentAtStartOfBlock.kt")
             public void testFunctionLiteralArgumentAtStartOfBlock() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentAtStartOfBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgumentInExpression.kt")
             public void testFunctionLiteralArgumentInExpression() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentInExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/functionLiteralArgumentInExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invalidArgument.kt")
             public void testInvalidArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/invalidArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/invalidArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingArgument.kt")
             public void testMissingArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/missingArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/missingArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingDefaultArgument.kt")
             public void testMissingDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/missingDefaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/missingDefaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multipleArguments.kt")
             public void testMultipleArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/multipleArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/multipleArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleArgument.kt")
             public void testSimpleArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/simpleArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/simpleArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeArguments.kt")
             public void testTypeArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/typeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/typeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg1.kt")
             public void testUnacceptableVararg1() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/unacceptableVararg1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/unacceptableVararg1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg2.kt")
             public void testUnacceptableVararg2() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/unacceptableVararg2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/unacceptableVararg2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("validNamedArgument.kt")
             public void testValidNamedArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/validNamedArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/validNamedArgument.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class ReplaceGetIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/acceptableVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/acceptableVararg.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInReplaceGetIntention() throws Exception {
@@ -294,77 +345,92 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("argumentAndFunction.kt")
             public void testArgumentAndFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/argumentAndFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/argumentAndFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("duplicateArguments.kt")
             public void testDuplicateArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/duplicateArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/duplicateArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/extensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/extensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionalArgument.kt")
             public void testFunctionalArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/functionalArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/functionalArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invalidArgument.kt")
             public void testInvalidArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/invalidArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/invalidArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingArgument.kt")
             public void testMissingArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/missingArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/missingArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingDefaultArgument.kt")
             public void testMissingDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/missingDefaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/missingDefaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("multiArgument.kt")
             public void testMultiArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/multiArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/multiArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namedAndFunction.kt")
             public void testNamedAndFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/namedAndFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/namedAndFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noArgument.kt")
             public void testNoArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/noArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/noArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("sanityCheck.kt")
             public void testSanityCheck() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/sanityCheck.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/sanityCheck.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("singleArgument.kt")
             public void testSingleArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/singleArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/singleArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("singleNamedArgument.kt")
             public void testSingleNamedArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/singleNamedArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/singleNamedArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg.kt")
             public void testUnacceptableVararg() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/unacceptableVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/unacceptableVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unnamedAndNamed.kt")
             public void testUnnamedAndNamed() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/unnamedAndNamed.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention/unnamedAndNamed.kt");
+                doTest(fileName);
             }
             
             public static Test innerSuite() {
@@ -375,6 +441,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ReplaceInvokeIntention extends AbstractIntentionTest {
             public void testAllFilesPresentInReplaceInvokeIntention() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -382,61 +449,73 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("extensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/extensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/extensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralInvoke.kt")
             public void testFunctionLiteralInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/functionLiteralInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/functionLiteralInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("invokeInExpression.kt")
             public void testInvokeInExpression() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/invokeInExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/invokeInExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namedArgumentInvoke.kt")
             public void testNamedArgumentInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/namedArgumentInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/namedArgumentInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noArgumentInvoke.kt")
             public void testNoArgumentInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/noArgumentInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/noArgumentInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeAndValueArgument.kt")
             public void testTypeAndValueArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/typeAndValueArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/typeAndValueArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeArgumentAndFunctionLiteral.kt")
             public void testTypeArgumentAndFunctionLiteral() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/typeArgumentAndFunctionLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valueAndFunctionLiteralInvoke.kt")
             public void testValueAndFunctionLiteralInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/valueAndFunctionLiteralInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valueArgumentInvoke.kt")
             public void testValueArgumentInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/valueArgumentInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/valueArgumentInvoke.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varargInvoke.kt")
             public void testVarargInvoke() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/varargInvoke.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/varargInvoke.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ReplaceUnaryPrefixIntention extends AbstractIntentionTest {
             @TestMetadata("acceptableVararg.kt")
             public void testAcceptableVararg() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/acceptableVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/acceptableVararg.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInReplaceUnaryPrefixIntention() throws Exception {
@@ -445,62 +524,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("complexPlus.kt")
             public void testComplexPlus() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/complexPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/complexPlus.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("defaultArgument.kt")
             public void testDefaultArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/defaultArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/defaultArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/extensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/extensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionLiteralArgument.kt")
             public void testFunctionLiteralArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/functionLiteralArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/functionLiteralArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("minusSanityTest.kt")
             public void testMinusSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/minusSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/minusSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("namedValueArgument.kt")
             public void testNamedValueArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/namedValueArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/namedValueArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notSanityTest.kt")
             public void testNotSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/notSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/notSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plusPlus.kt")
             public void testPlusPlus() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/plusPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/plusPlus.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("plusSanityTest.kt")
             public void testPlusSanityTest() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/plusSanityTest.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/plusSanityTest.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeArguments.kt")
             public void testTypeArguments() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/typeArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/typeArguments.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableVararg.kt")
             public void testUnacceptableVararg() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/unacceptableVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/unacceptableVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valueArgument.kt")
             public void testValueArgument() throws Exception {
-                doTest("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/valueArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/valueArgument.kt");
+                doTest(fileName);
             }
             
         }
@@ -518,6 +609,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/branched")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Branched.DoubleBangToIfThen.class, Branched.ElvisToIfThen.class, Branched.Folding.class, Branched.IfThenToDoubleBang.class, Branched.IfThenToElvis.class, Branched.IfThenToSafeAccess.class, Branched.IfWhen.class, Branched.SafeAccessToIfThen.class, Branched.Unfolding.class, Branched.When.class})
     public static class Branched extends AbstractIntentionTest {
         public void testAllFilesPresentInBranched() throws Exception {
@@ -525,6 +617,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DoubleBangToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInDoubleBangToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/doubleBangToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -532,67 +625,80 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("callExpression.kt")
             public void testCallExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/callExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callExpressionParens.kt")
             public void testCallExpressionParens() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/callExpressionParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/callExpressionParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("exceptionTextEscapesQuotes.kt")
             public void testExceptionTextEscapesQuotes() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextEscapesQuotes.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextEscapesQuotes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("exceptionTextHandlesMultiline.kt")
             public void testExceptionTextHandlesMultiline() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/exceptionTextHandlesMultiline.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVal.kt")
             public void testLocalVal() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/localVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVar.kt")
             public void testLocalVar() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/localVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleNameExpressionInParens.kt")
             public void testSimpleNameExpressionInParens() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/simpleNameExpressionInParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/simpleNameExpressionInParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVal.kt")
             public void testTopLevelVal() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelValCustomGetter.kt")
             public void testTopLevelValCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelValCustomGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVar.kt")
             public void testTopLevelVar() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVarCustomGetter.kt")
             public void testTopLevelVarCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/topLevelVarCustomGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usedInAssignment.kt")
             public void testUsedInAssignment() throws Exception {
-                doTest("idea/testData/intentions/branched/doubleBangToIfThen/usedInAssignment.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/doubleBangToIfThen/usedInAssignment.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/branched/elvisToIfThen")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ElvisToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInElvisToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/elvisToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -600,62 +706,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("callExpression.kt")
             public void testCallExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/callExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callExpressionParens.kt")
             public void testCallExpressionParens() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/callExpressionParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("elvisAsExpression.kt")
             public void testElvisAsExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/elvisAsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localValLhs.kt")
             public void testLocalValLhs() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localValLhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVarLhs.kt")
             public void testLocalVarLhs() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/localVarLhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleNameExpression.kt")
             public void testSimpleNameExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleNameExpressionInParens.kt")
             public void testSimpleNameExpressionInParens() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/simpleNameExpressionInParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVal.kt")
             public void testTopLevelVal() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelValCustomGetter.kt")
             public void testTopLevelValCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelValCustomGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVar.kt")
             public void testTopLevelVar() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVarCustomGetter.kt")
             public void testTopLevelVarCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/elvisToIfThen/topLevelVarCustomGetter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/branched/folding")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Folding.IfToAssignment.class, Folding.IfToReturn.class, Folding.IfToReturnAsymmetrically.class, Folding.WhenToAssignment.class, Folding.WhenToReturn.class})
         public static class Folding extends AbstractIntentionTest {
             public void testAllFilesPresentInFolding() throws Exception {
@@ -663,6 +781,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             }
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment")
+            @TestDataPath("$PROJECT_ROOT")
             public static class IfToAssignment extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToAssignment() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -670,52 +789,62 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerIfTransformed.kt")
                 public void testInnerIfTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/innerIfTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithAugmentedAssignment.kt")
                 public void testSimpleIfWithAugmentedAssignment() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithAugmentedAssignment.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithShadowedVar.kt")
                 public void testSimpleIfWithShadowedVar() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithShadowedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithUnmatchedAssignmentOps.kt")
                 public void testSimpleIfWithUnmatchedAssignmentOps() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignmentOps.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithUnmatchedAssignments.kt")
                 public void testSimpleIfWithUnmatchedAssignments() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithUnmatchedAssignments.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithoutElse.kt")
                 public void testSimpleIfWithoutElse() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutElse.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithoutTerminatingAssignment.kt")
                 public void testSimpleIfWithoutTerminatingAssignment() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToAssignment/simpleIfWithoutTerminatingAssignment.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToReturn")
+            @TestDataPath("$PROJECT_ROOT")
             public static class IfToReturn extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -723,22 +852,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerIfTransformed.kt")
                 public void testInnerIfTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/innerIfTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturn/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically")
+            @TestDataPath("$PROJECT_ROOT")
             public static class IfToReturnAsymmetrically extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToReturnAsymmetrically() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -746,22 +879,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithComments.kt")
                 public void testSimpleIfWithComments() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/simpleIfWithComments.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/folding/whenToAssignment")
+            @TestDataPath("$PROJECT_ROOT")
             public static class WhenToAssignment extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToAssignment() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -769,37 +906,44 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerWhenTransformed.kt")
                 public void testInnerWhenTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/innerWhenTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen.kt")
                 public void testSimpleWhen() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks.kt")
                 public void testSimpleWhenWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithShadowedVar.kt")
                 public void testSimpleWhenWithShadowedVar() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithShadowedVar.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithUnmatchedAssignments.kt")
                 public void testSimpleWhenWithUnmatchedAssignments() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithUnmatchedAssignments.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithoutTerminatingAssignment.kt")
                 public void testSimpleWhenWithoutTerminatingAssignment() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToAssignment/simpleWhenWithoutTerminatingAssignment.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/folding/whenToReturn")
+            @TestDataPath("$PROJECT_ROOT")
             public static class WhenToReturn extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToReturn() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -807,17 +951,20 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerWhenTransformed.kt")
                 public void testInnerWhenTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/innerWhenTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen.kt")
                 public void testSimpleWhen() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks.kt")
                 public void testSimpleWhenWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/folding/whenToReturn/simpleWhenWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -835,25 +982,30 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifThenToDoubleBang")
+        @TestDataPath("$PROJECT_ROOT")
         public static class IfThenToDoubleBang extends AbstractIntentionTest {
             @TestMetadata("acceptableEmptyElseBlockForStatement.kt")
             public void testAcceptableEmptyElseBlockForStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyElseBlockForStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyElseBlockForStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("acceptableEmptyThenBlockForStatement.kt")
             public void testAcceptableEmptyThenBlockForStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyThenBlockForStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableEmptyThenBlockForStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("acceptableWithoutElseBlockForStatementWithFun.kt")
             public void testAcceptableWithoutElseBlockForStatementWithFun() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("acceptableWithoutElseBlockForStatementWithVal.kt")
             public void testAcceptableWithoutElseBlockForStatementWithVal() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/acceptableWithoutElseBlockForStatementWithVal.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInIfThenToDoubleBang() throws Exception {
@@ -862,157 +1014,188 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("blockHasMoreThanOneStatement.kt")
             public void testBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/blockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("blockUsesDifferentVar.kt")
             public void testBlockUsesDifferentVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/blockUsesDifferentVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/blockUsesDifferentVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionComparesNullWithNull.kt")
             public void testConditionComparesNullWithNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/conditionComparesNullWithNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionComparesNullWithNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionInvalidBinaryExp.kt")
             public void testConditionInvalidBinaryExp() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/conditionInvalidBinaryExp.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionInvalidBinaryExp.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionNotBinaryExpr.kt")
             public void testConditionNotBinaryExpr() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/conditionNotBinaryExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt")
             public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueOutsideOfScope.kt")
             public void testDoesNotinlineValueOutsideOfScope() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueOutsideOfScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/doesNotinlineValueOutsideOfScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyCondition.kt")
             public void testEmptyCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/emptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyElseBlock.kt")
             public void testEmptyElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/emptyElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyThenBlock.kt")
             public void testEmptyThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/emptyThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/emptyThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseBothInBlocks.kt")
             public void testIfAndElseBothInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseBothInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseBothInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseNotInBlocks.kt")
             public void testIfAndElseNotInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseNotInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAndElseNotInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAsExpression.kt")
             public void testIfAsExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/ifAsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/ifAsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsEqualsNull.kt")
             public void testLhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/lhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsNotEqualsNull.kt")
             public void testLhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/lhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/lhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingElseClause.kt")
             public void testMissingElseClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/missingElseClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingElseClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingThenClause.kt")
             public void testMissingThenClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/missingThenClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/missingThenClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noCondition.kt")
             public void testNoCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/noCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noNullInCondition.kt")
             public void testNoNullInCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/noNullInCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/noNullInCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForFunction.kt")
             public void testNotApplicableForFunction() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForLocalVar.kt")
             public void testNotApplicableForLocalVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForLocalVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/notApplicableForLocalVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullBranchAlsoNull.kt")
             public void testNullBranchAlsoNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/nullBranchAlsoNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/nullBranchAlsoNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("otherBlockHasMoreThanOneStatement.kt")
             public void testOtherBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/otherBlockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/otherBlockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsEqualsNull.kt")
             public void testRhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/rhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsNotEqualsNull.kt")
             public void testRhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/rhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/rhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thenAndElseBothNull.kt")
             public void testThenAndElseBothNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/thenAndElseBothNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/thenAndElseBothNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("throwByFqName.kt")
             public void testThrowByFqName() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/throwByFqName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/throwByFqName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableEmptyElseBlockForExpression.kt")
             public void testUnacceptableEmptyElseBlockForExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyElseBlockForExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyElseBlockForExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableEmptyThenBlockForExpression.kt")
             public void testUnacceptableEmptyThenBlockForExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyThenBlockForExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/unacceptableEmptyThenBlockForExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("willNotInlineClassProperty.kt")
             public void testWillNotInlineClassProperty() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToDoubleBang/willNotInlineClassProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToDoubleBang/willNotInlineClassProperty.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifThenToElvis")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class IfThenToElvis extends AbstractIntentionTest {
             public void testAllFilesPresentInIfThenToElvis() throws Exception {
@@ -1021,157 +1204,188 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("blockHasMoreThanOneStatement.kt")
             public void testBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("blockUsesDifferentVar.kt")
             public void testBlockUsesDifferentVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/blockUsesDifferentVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionComparesNullWithNull.kt")
             public void testConditionComparesNullWithNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionComparesNullWithNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionInvalidBinaryExp.kt")
             public void testConditionInvalidBinaryExp() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionInvalidBinaryExp.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionNotBinaryExpr.kt")
             public void testConditionNotBinaryExpr() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/conditionNotBinaryExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt")
             public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueOutsideOfScope.kt")
             public void testDoesNotinlineValueOutsideOfScope() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/doesNotinlineValueOutsideOfScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyCondition.kt")
             public void testEmptyCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyElseBlock.kt")
             public void testEmptyElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyThenBlock.kt")
             public void testEmptyThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/emptyThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseBothInBlocks.kt")
             public void testIfAndElseBothInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseBothInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseNotInBlocks.kt")
             public void testIfAndElseNotInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAndElseNotInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAsExpression.kt")
             public void testIfAsExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAsPartOfExpression.kt")
             public void testIfAsPartOfExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/ifAsPartOfExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsEqualsNull.kt")
             public void testLhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsNotEqualsNull.kt")
             public void testLhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/lhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingElseClause.kt")
             public void testMissingElseClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingElseClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingThenClause.kt")
             public void testMissingThenClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/missingThenClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noCondition.kt")
             public void testNoCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/noCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noNullInCondition.kt")
             public void testNoNullInCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/noNullInCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForFunction.kt")
             public void testNotApplicableForFunction() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForLocalVar.kt")
             public void testNotApplicableForLocalVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForLocalVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForSimpleKotlinNPE.kt")
             public void testNotApplicableForSimpleKotlinNPE() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleKotlinNPE.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleKotlinNPE.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForSimpleNPE.kt")
             public void testNotApplicableForSimpleNPE() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleNPE.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/notApplicableForSimpleNPE.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nullBranchAlsoNull.kt")
             public void testNullBranchAlsoNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/nullBranchAlsoNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("otherBlockHasMoreThanOneStatement.kt")
             public void testOtherBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/otherBlockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsEqualsNull.kt")
             public void testRhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsNotEqualsNull.kt")
             public void testRhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/rhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thenAndElseBothNull.kt")
             public void testThenAndElseBothNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/thenAndElseBothNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("throwsNPEwithArgument.kt")
             public void testThrowsNPEwithArgument() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/throwsNPEwithArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("willNotInlineClassProperty.kt")
             public void testWillNotInlineClassProperty() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt");
+                doTest(fileName);
             }
             
             public static Test innerSuite() {
@@ -1182,6 +1396,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class IfThenToSafeAccess extends AbstractIntentionTest {
             public void testAllFilesPresentInIfThenToSafeAccess() throws Exception {
@@ -1190,172 +1405,206 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("blockHasMoreThanOneStatement.kt")
             public void testBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("blockUsesDifferentVar.kt")
             public void testBlockUsesDifferentVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/blockUsesDifferentVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionComparesNullWithNull.kt")
             public void testConditionComparesNullWithNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/conditionComparesNullWithNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionComparesNullWithNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionInvalidBinaryExp.kt")
             public void testConditionInvalidBinaryExp() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionInvalidBinaryExp.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("conditionNotBinaryExpr.kt")
             public void testConditionNotBinaryExpr() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/conditionNotBinaryExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueIfUsedMoreThanOnce.kt")
             public void testDoesNotinlineValueIfUsedMoreThanOnce() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueIfUsedMoreThanOnce.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("doesNotinlineValueOutsideOfScope.kt")
             public void testDoesNotinlineValueOutsideOfScope() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/doesNotinlineValueOutsideOfScope.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyCondition.kt")
             public void testEmptyCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/emptyCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyElseBlock.kt")
             public void testEmptyElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("emptyThenBlock.kt")
             public void testEmptyThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/emptyThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseBothInBlocks.kt")
             public void testIfAndElseBothInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseBothInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAndElseNotInBlocks.kt")
             public void testIfAndElseNotInBlocks() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAndElseNotInBlocks.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ifAsExpression.kt")
             public void testIfAsExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/ifAsExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsEqualsNull.kt")
             public void testLhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("lhsNotEqualsNull.kt")
             public void testLhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/lhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingNecessaryElseClause.kt")
             public void testMissingNecessaryElseClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryElseClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("missingNecessaryThenClause.kt")
             public void testMissingNecessaryThenClause() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/missingNecessaryThenClause.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noCondition.kt")
             public void testNoCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noElseBlock.kt")
             public void testNoElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noNullInCondition.kt")
             public void testNoNullInCondition() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noNullInCondition2.kt")
             public void testNoNullInCondition2() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noNullInCondition2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noThenBlock.kt")
             public void testNoThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/noThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForFunction.kt")
             public void testNotApplicableForFunction() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notApplicableForLocalVar.kt")
             public void testNotApplicableForLocalVar() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/notApplicableForLocalVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("otherBlockHasMoreThanOneStatement.kt")
             public void testOtherBlockHasMoreThanOneStatement() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/otherBlockHasMoreThanOneStatement.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsEqualsNull.kt")
             public void testRhsEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("rhsNotEqualsNull.kt")
             public void testRhsNotEqualsNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/rhsNotEqualsNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thenAndElseBothNull.kt")
             public void testThenAndElseBothNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseBothNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseBothNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("thenAndElseNotNull.kt")
             public void testThenAndElseNotNull() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/thenAndElseNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableEmptyElseBlock.kt")
             public void testUnacceptableEmptyElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableEmptyThenBlock.kt")
             public void testUnacceptableEmptyThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableEmptyThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableNoElseBlock.kt")
             public void testUnacceptableNoElseBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoElseBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unacceptableNoThenBlock.kt")
             public void testUnacceptableNoThenBlock() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoThenBlock.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/unacceptableNoThenBlock.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("willNotInlineClassProperty.kt")
             public void testWillNotInlineClassProperty() throws Exception {
-                doTest("idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt");
+                doTest(fileName);
             }
             
             public static Test innerSuite() {
@@ -1366,6 +1615,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/ifWhen")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({IfWhen.IfToWhen.class, IfWhen.WhenToIf.class})
         public static class IfWhen extends AbstractIntentionTest {
             public void testAllFilesPresentInIfWhen() throws Exception {
@@ -1373,6 +1623,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             }
             
             @TestMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen")
+            @TestDataPath("$PROJECT_ROOT")
             public static class IfToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInIfToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1380,57 +1631,68 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("ifWithEqualityTests.kt")
                 public void testIfWithEqualityTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithEqualityTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithIs.kt")
                 public void testIfWithIs() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithIs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithMultiConditions.kt")
                 public void testIfWithMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithNegativeIs.kt")
                 public void testIfWithNegativeIs() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeIs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithNegativeRangeTests.kt")
                 public void testIfWithNegativeRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithNegativeRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithRangeTests.kt")
                 public void testIfWithRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithRangeTestsAndMultiConditions.kt")
                 public void testIfWithRangeTestsAndMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithRangeTestsAndUnparenthesizedMultiConditions.kt")
                 public void testIfWithRangeTestsAndUnparenthesizedMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithRangeTestsAndUnparenthesizedMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ifWithoutElse.kt")
                 public void testIfWithoutElse() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/ifWithoutElse.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithMultipleConditionTypes.kt")
                 public void testWhenWithMultipleConditionTypes() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen/whenWithMultipleConditionTypes.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/ifWhen/whenToIf")
+            @TestDataPath("$PROJECT_ROOT")
             public static class WhenToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInWhenToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1438,57 +1700,68 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("whenWithDotQualifiedExpression.kt")
                 public void testWhenWithDotQualifiedExpression() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithDotQualifiedExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithEqualityTests.kt")
                 public void testWhenWithEqualityTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithEqualityTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithMultiConditions.kt")
                 public void testWhenWithMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithMultipleConditionTypes.kt")
                 public void testWhenWithMultipleConditionTypes() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithMultipleConditionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativePatterns.kt")
                 public void testWhenWithNegativePatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativePatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativeRangeTests.kt")
                 public void testWhenWithNegativeRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithNegativeRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithPatterns.kt")
                 public void testWhenWithPatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithPatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTests.kt")
                 public void testWhenWithRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTestsAndMultiConditions.kt")
                 public void testWhenWithRangeTestsAndMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithRangeTestsAndMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithoutElse.kt")
                 public void testWhenWithoutElse() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutElse.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithoutSubject.kt")
                 public void testWhenWithoutSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/ifWhen/whenToIf/whenWithoutSubject.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1503,6 +1776,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/safeAccessToIfThen")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SafeAccessToIfThen extends AbstractIntentionTest {
             public void testAllFilesPresentInSafeAccessToIfThen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/safeAccessToIfThen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1510,117 +1784,140 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("binaryExpressionLhs.kt")
             public void testBinaryExpressionLhs() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/binaryExpressionLhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callExpression.kt")
             public void testCallExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("callExpressionParens.kt")
             public void testCallExpressionParens() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/callExpressionParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("customGetterAsReceiver.kt")
             public void testCustomGetterAsReceiver() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/customGetterAsReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localValAsReceiver.kt")
             public void testLocalValAsReceiver() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValAsReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localValLhs.kt")
             public void testLocalValLhs() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localValLhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localVarLhs.kt")
             public void testLocalVarLhs() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/localVarLhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("resultAssignedToLocalVal.kt")
             public void testResultAssignedToLocalVal() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/resultAssignedToLocalVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("safeAccessAsFunctionArgument.kt")
             public void testSafeAccessAsFunctionArgument() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/safeAccessAsFunctionArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleNameExpression.kt")
             public void testSimpleNameExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpression.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleNameExpressionInParens.kt")
             public void testSimpleNameExpressionInParens() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simpleNameExpressionInParens.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simplePropertyAsReceiver.kt")
             public void testSimplePropertyAsReceiver() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simplePropertyAsReceiver2.kt")
             public void testSimplePropertyAsReceiver2() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simplePropertyAsReceiver3.kt")
             public void testSimplePropertyAsReceiver3() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/simplePropertyAsReceiver3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVal.kt")
             public void testTopLevelVal() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelValCustomGetter.kt")
             public void testTopLevelValCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelValCustomGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVar.kt")
             public void testTopLevelVar() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelVarCustomGetter.kt")
             public void testTopLevelVarCustomGetter() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/topLevelVarCustomGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usedAsFunctionRhs.kt")
             public void testUsedAsFunctionRhs() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsFunctionRhs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usedAsResultOfCheckedIf.kt")
             public void testUsedAsResultOfCheckedIf() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsResultOfCheckedIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usedAsReturnValue.kt")
             public void testUsedAsReturnValue() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedAsReturnValue.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("usedInUncheckedIfExpression.kt")
             public void testUsedInUncheckedIfExpression() throws Exception {
-                doTest("idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/safeAccessToIfThen/usedInUncheckedIfExpression.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/branched/unfolding")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Unfolding.AssignmentToIf.class, Unfolding.AssignmentToWhen.class, Unfolding.PropertyToIf.class, Unfolding.PropertyToWhen.class, Unfolding.ReturnToIf.class, Unfolding.ReturnToWhen.class})
         public static class Unfolding extends AbstractIntentionTest {
             public void testAllFilesPresentInUnfolding() throws Exception {
@@ -1628,6 +1925,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf")
+            @TestDataPath("$PROJECT_ROOT")
             public static class AssignmentToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInAssignmentToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1635,42 +1933,50 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerIfTransformed.kt")
                 public void testInnerIfTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/innerIfTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedIfs.kt")
                 public void testNestedIfs() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/nestedIfs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithAugmentedAssignment.kt")
                 public void testSimpleIfWithAugmentedAssignment() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithAugmentedAssignment.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithComplexAssignmentLHS.kt")
                 public void testSimpleIfWithComplexAssignmentLHS() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithComplexAssignmentLHS.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithoutAssignment.kt")
                 public void testSimpleIfWithoutAssignment() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf/simpleIfWithoutAssignment.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen")
+            @TestDataPath("$PROJECT_ROOT")
             public static class AssignmentToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInAssignmentToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1678,27 +1984,32 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerWhenTransformed.kt")
                 public void testInnerWhenTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/innerWhenTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen.kt")
                 public void testSimpleWhen() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks.kt")
                 public void testSimpleWhenWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithComplexAssignmentLHS.kt")
                 public void testSimpleWhenWithComplexAssignmentLHS() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen/simpleWhenWithComplexAssignmentLHS.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToIf")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PropertyToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInPropertyToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1706,52 +2017,62 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("nestedIfs.kt")
                 public void testNestedIfs() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nestedIfs2.kt")
                 public void testNestedIfs2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nestedIfs2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nonLocalProperty.kt")
                 public void testNonLocalProperty() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nonLocalProperty2.kt")
                 public void testNonLocalProperty2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/nonLocalProperty2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf2.kt")
                 public void testSimpleIf2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIf2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks2.kt")
                 public void testSimpleIfWithBlocks2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithBlocks2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithType.kt")
                 public void testSimpleIfWithType() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToIf/simpleIfWithType.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen")
+            @TestDataPath("$PROJECT_ROOT")
             public static class PropertyToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInPropertyToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1759,42 +2080,50 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("nonLocalProperty.kt")
                 public void testNonLocalProperty() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("nonLocalProperty2.kt")
                 public void testNonLocalProperty2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/nonLocalProperty2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen.kt")
                 public void testSimpleWhen() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen2.kt")
                 public void testSimpleWhen2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhen2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks.kt")
                 public void testSimpleWhenWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks2.kt")
                 public void testSimpleWhenWithBlocks2() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithBlocks2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithType.kt")
                 public void testSimpleWhenWithType() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen/simpleWhenWithType.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/returnToIf")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ReturnToIf extends AbstractIntentionTest {
                 public void testAllFilesPresentInReturnToIf() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1802,22 +2131,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerIfTransformed.kt")
                 public void testInnerIfTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/innerIfTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIf.kt")
                 public void testSimpleIf() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIf.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleIfWithBlocks.kt")
                 public void testSimpleIfWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToIf/simpleIfWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/unfolding/returnToWhen")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ReturnToWhen extends AbstractIntentionTest {
                 public void testAllFilesPresentInReturnToWhen() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1825,17 +2158,20 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("innerWhenTransformed.kt")
                 public void testInnerWhenTransformed() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/innerWhenTransformed.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhen.kt")
                 public void testSimpleWhen() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhen.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("simpleWhenWithBlocks.kt")
                 public void testSimpleWhenWithBlocks() throws Exception {
-                    doTest("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/unfolding/returnToWhen/simpleWhenWithBlocks.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1854,6 +2190,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/branched/when")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({When.EliminateSubject.class, When.Flatten.class, When.IntroduceSubject.class, When.Merge.class})
         public static class When extends AbstractIntentionTest {
             public void testAllFilesPresentInWhen() throws Exception {
@@ -1861,6 +2198,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             }
             
             @TestMetadata("idea/testData/intentions/branched/when/eliminateSubject")
+            @TestDataPath("$PROJECT_ROOT")
             public static class EliminateSubject extends AbstractIntentionTest {
                 public void testAllFilesPresentInEliminateSubject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1868,47 +2206,56 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("whenWithEqualityTests.kt")
                 public void testWhenWithEqualityTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithEqualityTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithMultipleConditionTypes.kt")
                 public void testWhenWithMultipleConditionTypes() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithMultipleConditionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativePatterns.kt")
                 public void testWhenWithNegativePatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativePatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativeRangeTests.kt")
                 public void testWhenWithNegativeRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithNegativeRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithPatterns.kt")
                 public void testWhenWithPatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithPatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTests.kt")
                 public void testWhenWithRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTestsAndMultiConditions.kt")
                 public void testWhenWithRangeTestsAndMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithRangeTestsAndMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithoutSubject.kt")
                 public void testWhenWithoutSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/eliminateSubject/whenWithoutSubject.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/when/flatten")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Flatten extends AbstractIntentionTest {
                 public void testAllFilesPresentInFlatten() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1916,22 +2263,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("flattenWithSubject.kt")
                 public void testFlattenWithSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithSubject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("flattenWithUnmatchedSubjects.kt")
                 public void testFlattenWithUnmatchedSubjects() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithUnmatchedSubjects.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("flattenWithoutSubject.kt")
                 public void testFlattenWithoutSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/flatten/flattenWithoutSubject.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/when/introduceSubject")
+            @TestDataPath("$PROJECT_ROOT")
             public static class IntroduceSubject extends AbstractIntentionTest {
                 public void testAllFilesPresentInIntroduceSubject() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1939,62 +2290,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("whenWithEqualityTests.kt")
                 public void testWhenWithEqualityTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithEqualityTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithMultipleConditionTypes.kt")
                 public void testWhenWithMultipleConditionTypes() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithMultipleConditionTypes.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativePatterns.kt")
                 public void testWhenWithNegativePatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativePatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNegativeRangeTests.kt")
                 public void testWhenWithNegativeRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNegativeRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithNondivisibleConditions.kt")
                 public void testWhenWithNondivisibleConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithNondivisibleConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithPatterns.kt")
                 public void testWhenWithPatterns() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithPatterns.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTests.kt")
                 public void testWhenWithRangeTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithRangeTestsAndMultiConditions.kt")
                 public void testWhenWithRangeTestsAndMultiConditions() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithRangeTestsAndMultiConditions.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithSubject.kt")
                 public void testWhenWithSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSubject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithSwappedEqualityTests.kt")
                 public void testWhenWithSwappedEqualityTests() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithSwappedEqualityTests.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("whenWithUnmatchedCandidateSubjects.kt")
                 public void testWhenWithUnmatchedCandidateSubjects() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/introduceSubject/whenWithUnmatchedCandidateSubjects.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/intentions/branched/when/merge")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Merge extends AbstractIntentionTest {
                 public void testAllFilesPresentInMerge() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2002,87 +2365,104 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
                 
                 @TestMetadata("mergeBlockWithBlock.kt")
                 public void testMergeBlockWithBlock() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithBlock.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeBlockWithSingle.kt")
                 public void testMergeBlockWithSingle() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeBlockWithSingle.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithConflictingDeclarations.kt")
                 public void testMergeWithConflictingDeclarations() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithConflictingDeclarations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithDeclarations.kt")
                 public void testMergeWithDeclarations() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithDeclarations.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithReturnAfter.kt")
                 public void testMergeWithReturnAfter() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnAfter.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithReturnBefore.kt")
                 public void testMergeWithReturnBefore() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithReturnBefore.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithSubject.kt")
                 public void testMergeWithSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithSubject.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions1.kt")
                 public void testMergeWithUnmatchedConditions1() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions2.kt")
                 public void testMergeWithUnmatchedConditions2() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions3.kt")
                 public void testMergeWithUnmatchedConditions3() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions3.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions4.kt")
                 public void testMergeWithUnmatchedConditions4() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions4.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions5.kt")
                 public void testMergeWithUnmatchedConditions5() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions5.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions6.kt")
                 public void testMergeWithUnmatchedConditions6() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions6.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedConditions7.kt")
                 public void testMergeWithUnmatchedConditions7() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedConditions7.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedSubjects1.kt")
                 public void testMergeWithUnmatchedSubjects1() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithUnmatchedSubjects2.kt")
                 public void testMergeWithUnmatchedSubjects2() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithUnmatchedSubjects2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("mergeWithoutSubject.kt")
                 public void testMergeWithoutSubject() throws Exception {
-                    doTest("idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/branched/when/merge/mergeWithoutSubject.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -2116,6 +2496,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/convertAssertToIf")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertAssertToIf extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertAssertToIf() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertAssertToIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2123,102 +2504,122 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("assertErrorOverloaded.kt")
         public void testAssertErrorOverloaded() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/assertErrorOverloaded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanCondition.kt")
         public void testBooleanCondition() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/booleanCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanConditionSimplified.kt")
         public void testBooleanConditionSimplified() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanConditionSimplified2.kt")
         public void testBooleanConditionSimplified2() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionSimplified2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanConditionWithVariables.kt")
         public void testBooleanConditionWithVariables() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/booleanConditionWithVariables.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/booleanConditionWithVariables.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doNotShortenReferenceInsideMessage.kt")
         public void testDoNotShortenReferenceInsideMessage() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/doNotShortenReferenceInsideMessage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/doNotShortenReferenceInsideMessage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("dotQualifiedCall.kt")
         public void testDotQualifiedCall() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/dotQualifiedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionCallCondition.kt")
         public void testFunctionCallCondition() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/functionCallCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionCallCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionMessageInsideParentheses.kt")
         public void testFunctionMessageInsideParentheses() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/functionMessageInsideParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/functionMessageInsideParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableAssertOverloaded.kt")
         public void testInapplicableAssertOverloaded() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloaded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloaded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableAssertOverloadedWithPackage.kt")
         public void testInapplicableAssertOverloadedWithPackage() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloadedWithPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableAssertOverloadedWithPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNoCondition.kt")
         public void testInapplicableNoCondition() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/inapplicableNoCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaMessageInsideParentheses.kt")
         public void testLambdaMessageInsideParentheses() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/lambdaMessageInsideParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageInsideParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaMessageOutsideParentheses.kt")
         public void testLambdaMessageOutsideParentheses() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/lambdaMessageOutsideParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaMessageOutsideParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaVariable.kt")
         public void testLambdaVariable() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/lambdaVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/lambdaVariable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noMessage.kt")
         public void testNoMessage() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/noMessage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/noMessage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesizedCondition.kt")
         public void testParenthesizedCondition() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/parenthesizedCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/parenthesizedCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleConvert.kt")
         public void testSimpleConvert() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/simpleConvert.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/simpleConvert.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringVariable.kt")
         public void testStringVariable() throws Exception {
-            doTest("idea/testData/intentions/convertAssertToIf/stringVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertAssertToIf/stringVariable.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertIfToAssert")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertIfToAssert extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertIfToAssert() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfToAssert"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2226,72 +2627,86 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("assertOverloaded.kt")
         public void testAssertOverloaded() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/assertOverloaded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/assertOverloaded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("assertOverloaded2.kt")
         public void testAssertOverloaded2() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/assertOverloaded2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanCondition.kt")
         public void testBooleanCondition() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/booleanCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/booleanCondition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("dotQualifiedThrow.kt")
         public void testDotQualifiedThrow() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/dotQualifiedThrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableAssertionErrorOverloaded.kt")
         public void testInapplicableAssertionErrorOverloaded() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/inapplicableAssertionErrorOverloaded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableAssertionErrorOverloaded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableCauseSent.kt")
         public void testInapplicableCauseSent() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/inapplicableCauseSent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableCauseSent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableHasElse.kt")
         public void testInapplicableHasElse() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/inapplicableHasElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableHasElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableMoreThanSingleExpression.kt")
         public void testInapplicableMoreThanSingleExpression() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableMoreThanSingleExpression2.kt")
         public void testInapplicableMoreThanSingleExpression2() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/inapplicableMoreThanSingleExpression2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noMessageSent.kt")
         public void testNoMessageSent() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/noMessageSent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/noMessageSent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullSent.kt")
         public void testNullSent() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/nullSent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/nullSent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleConvert.kt")
         public void testSimpleConvert() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/simpleConvert.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/simpleConvert.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simplifiedCondition.kt")
         public void testSimplifiedCondition() throws Exception {
-            doTest("idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertIfToAssert/simplifiedCondition.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertNegatedBooleanSequence")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertNegatedBooleanSequence extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertNegatedBooleanSequence() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedBooleanSequence"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2299,57 +2714,68 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("complexNegatedSequence.kt")
         public void testComplexNegatedSequence() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/complexNegatedSequence.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/complexNegatedSequence.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunctionOfThreeNegations.kt")
         public void testConjunctionOfThreeNegations() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfThreeNegations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfThreeNegations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunctionOfTwoNegations.kt")
         public void testConjunctionOfTwoNegations() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfTwoNegations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/conjunctionOfTwoNegations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunctionOfTwoNegations.kt")
         public void testDisjunctionOfTwoNegations() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/disjunctionOfTwoNegations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/disjunctionOfTwoNegations.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleParenthesizedExpression.kt")
         public void testDoubleParenthesizedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/doubleParenthesizedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/doubleParenthesizedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableMixedOperators.kt")
         public void testInapplicableMixedOperators() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedOperators.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableMixedSequence.kt")
         public void testInapplicableMixedSequence() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedSequence.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableMixedSequence.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableSingleExpression.kt")
         public void testInapplicableSingleExpression() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableSingleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/inapplicableSingleExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("negatedFunction.kt")
         public void testNegatedFunction() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/negatedFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/negatedFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesizedConjunctionOfTwoNegations.kt")
         public void testParenthesizedConjunctionOfTwoNegations() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedBooleanSequence/parenthesizedConjunctionOfTwoNegations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedBooleanSequence/parenthesizedConjunctionOfTwoNegations.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertNegatedExpressionWithDemorgansLaw extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertNegatedExpressionWithDemorgansLaw() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2357,77 +2783,92 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("complexNegation1.kt")
         public void testComplexNegation1() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("complexNegation2.kt")
         public void testComplexNegation2() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/complexNegation2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunctionNegation1.kt")
         public void testConjunctionNegation1() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunctionNegation2.kt")
         public void testConjunctionNegation2() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/conjunctionNegation2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunctionNegation1.kt")
         public void testDisjunctionNegation1() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunctionNegation2.kt")
         public void testDisjunctionNegation2() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/disjunctionNegation2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleNegation.kt")
         public void testDoubleNegation() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/doubleNegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/doubleNegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNormalExpression.kt")
         public void testInapplicableNormalExpression() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableNormalExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableNormalExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableOperator.kt")
         public void testInapplicableOperator() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableTriple.kt")
         public void testInapplicableTriple() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableTriple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/inapplicableTriple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("longMixedExpression.kt")
         public void testLongMixedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/longMixedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/longMixedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("mixedExpression.kt")
         public void testMixedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/mixedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/mixedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonstandardPrefixOperator.kt")
         public void testNonstandardPrefixOperator() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/nonstandardPrefixOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/nonstandardPrefixOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("retainedParens.kt")
         public void testRetainedParens() throws Exception {
-            doTest("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/retainedParens.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/retainedParens.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToBlockBody")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToBlockBody extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToBlockBody() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2435,72 +2876,86 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("explicitlyNonUnitFun.kt")
         public void testExplicitlyNonUnitFun() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyNonUnitFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitlyTypedFunWithUnresolvedExpression.kt")
         public void testExplicitlyTypedFunWithUnresolvedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitlyTypedFunWithUnresolvedType.kt")
         public void testExplicitlyTypedFunWithUnresolvedType() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyTypedFunWithUnresolvedType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitlyUnitFun.kt")
         public void testExplicitlyUnitFun() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitlyUnitFunWithUnresolvedExpression.kt")
         public void testExplicitlyUnitFunWithUnresolvedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/explicitlyUnitFunWithUnresolvedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithThrow.kt")
         public void testFunWithThrow() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/funWithThrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/funWithThrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("getter.kt")
         public void testGetter() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/getter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("getterWithThrow.kt")
         public void testGetterWithThrow() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/getterWithThrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/getterWithThrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitlyNonUnitFun.kt")
         public void testImplicitlyNonUnitFun() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyNonUnitFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitlyTypedFunWithUnresolvedType.kt")
         public void testImplicitlyTypedFunWithUnresolvedType() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/implicitlyTypedFunWithUnresolvedType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyTypedFunWithUnresolvedType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitlyUnitFun.kt")
         public void testImplicitlyUnitFun() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/implicitlyUnitFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nothingFun.kt")
         public void testNothingFun() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/nothingFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/nothingFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("setter.kt")
         public void testSetter() throws Exception {
-            doTest("idea/testData/intentions/convertToBlockBody/setter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToBlockBody/setter.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToConcatenatedStringIntention")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToConcatenatedStringIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToConcatenatedStringIntention() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToConcatenatedStringIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2508,127 +2963,152 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("embeddedIf.kt")
         public void testEmbeddedIf() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/embeddedIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/embeddedIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("embeddedIfBraces.kt")
         public void testEmbeddedIfBraces() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/embeddedIfBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/embeddedIfBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("handlesEscapeString.kt")
         public void testHandlesEscapeString() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/handlesEscapeString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/handlesEscapeString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate2StringConstants.kt")
         public void testInterpolate2StringConstants() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolate2StringConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolate2StringConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate3.kt")
         public void testInterpolate3() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolate3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolate3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateChar.kt")
         public void testInterpolateChar() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateChar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateChar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateConstants.kt")
         public void testInterpolateConstants() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateMapAccess.kt")
         public void testInterpolateMapAccess() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateMapAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateMapAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateMethodInvoke.kt")
         public void testInterpolateMethodInvoke() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateMethodInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateMethodInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateSimpleWithBraces.kt")
         public void testInterpolateSimpleWithBraces() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateSimpleWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateSimpleWithBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateStringWithFloat.kt")
         public void testInterpolateStringWithFloat() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateStringWithFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateStringWithFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateStringWithInt.kt")
         public void testInterpolateStringWithInt() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateStringWithInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/interpolateStringWithInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lastExprIsNamedExpression.kt")
         public void testLastExprIsNamedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/lastExprIsNamedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/lastExprIsNamedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineString.kt")
         public void testMultilineString() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/multilineString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/multilineString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineWhenExpr.kt")
         public void testMultilineWhenExpr() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/multilineWhenExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/multilineWhenExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("namedExprBetweenConstants.kt")
         public void testNamedExprBetweenConstants() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/namedExprBetweenConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/namedExprBetweenConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableForErrorElement.kt")
         public void testNotApplicableForErrorElement() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/notApplicableForErrorElement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/notApplicableForErrorElement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableForSimple.kt")
         public void testNotApplicableForSimple() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/notApplicableForSimple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/notApplicableForSimple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notAvailableForDollarSignLiteral.kt")
         public void testNotAvailableForDollarSignLiteral() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/notAvailableForDollarSignLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/notAvailableForDollarSignLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("singleVar.kt")
         public void testSingleVar() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/singleVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/singleVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("startsWithInt.kt")
         public void testStartsWithInt() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/startsWithInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/startsWithInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("startsWithStringExpression.kt")
         public void testStartsWithStringExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/startsWithStringExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/startsWithStringExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tricky.kt")
         public void testTricky() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/tricky.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/tricky.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("withAndWithoutBraces.kt")
         public void testWithAndWithoutBraces() throws Exception {
-            doTest("idea/testData/intentions/convertToConcatenatedStringIntention/withAndWithoutBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToConcatenatedStringIntention/withAndWithoutBraces.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToExpressionBody")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToExpressionBody extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToExpressionBody() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2636,92 +3116,110 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("anonymousObjectExpression.kt")
         public void testAnonymousObjectExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/anonymousObjectExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("assignment.kt")
         public void testAssignment() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/assignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/assignment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("declaration.kt")
         public void testDeclaration() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/declaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/declaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expressionWithReturns1.kt")
         public void testExpressionWithReturns1() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/expressionWithReturns1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("expressionWithReturns2.kt")
         public void testExpressionWithReturns2() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/expressionWithReturns2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/expressionWithReturns2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithImplicitUnitTypeWithThrow.kt")
         public void testFunWithImplicitUnitTypeWithThrow() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithImplicitUnitTypeWithThrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithNoBlock.kt")
         public void testFunWithNoBlock() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithNoBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNoBlock.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithNothingType.kt")
         public void testFunWithNothingType() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithNothingType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithReturn.kt")
         public void testFunWithReturn() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithUnitType.kt")
         public void testFunWithUnitType() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithUnitType2.kt")
         public void testFunWithUnitType2() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithUnitType2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitType2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("funWithUnitTypeWithThrow.kt")
         public void testFunWithUnitTypeWithThrow() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/funWithUnitTypeWithThrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/functionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/functionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("getWithReturn.kt")
         public void testGetWithReturn() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/getWithReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/getWithReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleStatements.kt")
         public void testMultipleStatements() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/multipleStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/multipleStatements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnWithNoValue.kt")
         public void testReturnWithNoValue() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/returnWithNoValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/returnWithNoValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("while.kt")
         public void testWhile() throws Exception {
-            doTest("idea/testData/intentions/convertToExpressionBody/while.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToExpressionBody/while.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToForEachFunctionCall")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToForEachFunctionCall extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToForEachFunctionCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2729,42 +3227,50 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("binaryExpressionLoopRange.kt")
         public void testBinaryExpressionLoopRange() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/binaryExpressionLoopRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/binaryExpressionLoopRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("blockBodyExpression.kt")
         public void testBlockBodyExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/blockBodyExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/blockBodyExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("iterativeElementTypeSpecified.kt")
         public void testIterativeElementTypeSpecified() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/iterativeElementTypeSpecified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/iterativeElementTypeSpecified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noCurlyBraces.kt")
         public void testNoCurlyBraces() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/noCurlyBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noCurlyBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noStatements.kt")
         public void testNoStatements() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/noStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/noStatements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typeAnnotatedWithNonBlockBody.kt")
         public void testTypeAnnotatedWithNonBlockBody() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachFunctionCall/typeAnnotatedWithNonBlockBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachFunctionCall/typeAnnotatedWithNonBlockBody.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToForEachLoop")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToForEachLoop extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToForEachLoop() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachLoop"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2772,57 +3278,68 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("complexReceiver.kt")
         public void testComplexReceiver() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/complexReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/complexReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitFunctionLiteral.kt")
         public void testExplicitFunctionLiteral() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/explicitFunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/explicitFunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("extraArguments.kt")
         public void testExtraArguments() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/extraArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/extraArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("implicitFunctionLiteralParameter.kt")
         public void testImplicitFunctionLiteralParameter() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/implicitFunctionLiteralParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/implicitFunctionLiteralParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixCall.kt")
         public void testInfixCall() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/infixCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/infixCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesizedExpression.kt")
         public void testParenthesizedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/parenthesizedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/parenthesizedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typeArgumentPresent.kt")
         public void testTypeArgumentPresent() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/typeArgumentPresent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/typeArgumentPresent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("userDefined.kt")
         public void testUserDefined() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/userDefined.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/userDefined.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("zeroArguments.kt")
         public void testZeroArguments() throws Exception {
-            doTest("idea/testData/intentions/convertToForEachLoop/zeroArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToForEachLoop/zeroArguments.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/convertToStringTemplateIntention")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConvertToStringTemplateIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInConvertToStringTemplateIntention() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToStringTemplateIntention"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2830,142 +3347,170 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("backslashNMultilineString.kt")
         public void testBackslashNMultilineString() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/backslashNMultilineString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/backslashNMultilineString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("combineEmptyStrings.kt")
         public void testCombineEmptyStrings() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/combineEmptyStrings.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/combineEmptyStrings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("combinesNonStringsAsStrings.kt")
         public void testCombinesNonStringsAsStrings() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/combinesNonStringsAsStrings.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/combinesNonStringsAsStrings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("combinesNonStringsAsStrings2.kt")
         public void testCombinesNonStringsAsStrings2() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/combinesNonStringsAsStrings2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/combinesNonStringsAsStrings2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("consecutiveNewlines.kt")
         public void testConsecutiveNewlines() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/consecutiveNewlines.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/consecutiveNewlines.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doesNotCorruptExistingTemplate.kt")
         public void testDoesNotCorruptExistingTemplate() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/doesNotCorruptExistingTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/doesNotCorruptExistingTemplate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doesNotCorruptExistingTemplateWithBraces.kt")
         public void testDoesNotCorruptExistingTemplateWithBraces() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/doesNotCorruptExistingTemplateWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/doesNotCorruptExistingTemplateWithBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBracesForSimpleNamedExpression.kt")
         public void testInsertBracesForSimpleNamedExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/insertBracesForSimpleNamedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/insertBracesForSimpleNamedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate2StringConstants.kt")
         public void testInterpolate2StringConstants() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolate2StringConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolate2StringConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate2Vals.kt")
         public void testInterpolate2Vals() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolate2Vals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolate2Vals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate3Left.kt")
         public void testInterpolate3Left() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolate3Left.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolate3Left.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolate3Right.kt")
         public void testInterpolate3Right() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolate3Right.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolate3Right.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateChar.kt")
         public void testInterpolateChar() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateChar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateChar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateDollarSign.kt")
         public void testInterpolateDollarSign() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateDollarSign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateDollarSign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateMapAccess.kt")
         public void testInterpolateMapAccess() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateMapAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateMapAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateMethodInvoke.kt")
         public void testInterpolateMethodInvoke() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateMethodInvoke.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateMethodInvoke.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateMultiline.kt")
         public void testInterpolateMultiline() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateMultiline.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateMultiline.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateStringWithFloat.kt")
         public void testInterpolateStringWithFloat() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateStringWithFloat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateStringWithFloat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("interpolateStringWithInt.kt")
         public void testInterpolateStringWithInt() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/interpolateStringWithInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/interpolateStringWithInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multilineString.kt")
         public void testMultilineString() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/multilineString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/multilineString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noBracesForLastSimpleExpression.kt")
         public void testNoBracesForLastSimpleExpression() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/noBracesForLastSimpleExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/noBracesForLastSimpleExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noBracesSimpleFollowedByDot.kt")
         public void testNoBracesSimpleFollowedByDot() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/noBracesSimpleFollowedByDot.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/noBracesSimpleFollowedByDot.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableForErrorElement.kt")
         public void testNotApplicableForErrorElement() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/notApplicableForErrorElement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/notApplicableForErrorElement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("onlyForConcat.kt")
         public void testOnlyForConcat() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/onlyForConcat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/onlyForConcat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("onlyForStrings.kt")
         public void testOnlyForStrings() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/onlyForStrings.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/onlyForStrings.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("requiresPlusOperator.kt")
         public void testRequiresPlusOperator() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/requiresPlusOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/requiresPlusOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("tricky.kt")
         public void testTricky() throws Exception {
-            doTest("idea/testData/intentions/convertToStringTemplateIntention/tricky.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplateIntention/tricky.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/declarations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Declarations.ConvertMemberToExtension.class, Declarations.Split.class})
     public static class Declarations extends AbstractIntentionTest {
         public void testAllFilesPresentInDeclarations() throws Exception {
@@ -2973,15 +3518,18 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
         
         @TestMetadata("idea/testData/intentions/declarations/convertMemberToExtension")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ConvertMemberToExtension extends AbstractIntentionTest {
             @TestMetadata("abstract.kt")
             public void testAbstract() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstract.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("abstractProperty.kt")
             public void testAbstractProperty() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInConvertMemberToExtension() throws Exception {
@@ -2990,172 +3538,206 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("explicitUnit.kt")
             public void testExplicitUnit() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/explicitUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/explicitUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("extension.kt")
             public void testExtension() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/extension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/extension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("funcitonNoName.kt")
             public void testFuncitonNoName() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/funcitonNoName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/funcitonNoName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("functionType.kt")
             public void testFunctionType() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/functionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericClass.kt")
             public void testGenericClass() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericFun.kt")
             public void testGenericFun() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericFunInGenericClass.kt")
             public void testGenericFunInGenericClass() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericFunInGenericClassWithUpperBounds.kt")
             public void testGenericFunInGenericClassWithUpperBounds() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunInGenericClassWithUpperBounds.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericFunParamAfterName.kt")
             public void testGenericFunParamAfterName() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericFunParamAfterName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("genericProperty.kt")
             public void testGenericProperty() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/genericProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inFunctionBody.kt")
             public void testInFunctionBody() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/inFunctionBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inFunctionBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("inObject.kt")
             public void testInObject() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/inObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/inObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("internal.kt")
             public void testInternal() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/internal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/internal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("localFunction.kt")
             public void testLocalFunction() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/localFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/localFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nonBlockBodyNoType.kt")
             public void testNonBlockBodyNoType() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyNoType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyNoType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nonBlockBodyWithType.kt")
             public void testNonBlockBodyWithType() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyWithType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/nonBlockBodyWithType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("outsideFunction.kt")
             public void testOutsideFunction() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/outsideFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/outsideFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("private.kt")
             public void testPrivate() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/private.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/private.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("protected.kt")
             public void testProtected() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/protected.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/protected.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("public.kt")
             public void testPublic() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/public.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/public.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simple.kt")
             public void testSimple() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("topLevelFunction.kt")
             public void testTopLevelFunction() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/topLevelFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/topLevelFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("typeFqName.kt")
             public void testTypeFqName() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/typeFqName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("unknownType.kt")
             public void testUnknownType() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/unknownType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valWithDefaultGetter.kt")
             public void testValWithDefaultGetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valWithGetter.kt")
             public void testValWithGetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("valWithGetterBlockBody.kt")
             public void testValWithGetterBlockBody() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetterBlockBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/valWithGetterBlockBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varWithDefaultGetterAndSetter.kt")
             public void testVarWithDefaultGetterAndSetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varWithDefaultSetter.kt")
             public void testVarWithDefaultSetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varWithGetter.kt")
             public void testVarWithGetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varWithGetterAndSetter.kt")
             public void testVarWithGetterAndSetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetterAndSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithGetterAndSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("varWithSetter.kt")
             public void testVarWithSetter() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("withType.kt")
             public void testWithType() throws Exception {
-                doTest("idea/testData/intentions/declarations/convertMemberToExtension/withType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/convertMemberToExtension/withType.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/intentions/declarations/split")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Split extends AbstractIntentionTest {
             public void testAllFilesPresentInSplit() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3163,62 +3745,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             
             @TestMetadata("longInit.kt")
             public void testLongInit() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/longInit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("longInit2.kt")
             public void testLongInit2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/longInit2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/longInit2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noInitializer.kt")
             public void testNoInitializer() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/noInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("noInitializer2.kt")
             public void testNoInitializer2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/noInitializer2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/noInitializer2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nonLocalProperty.kt")
             public void testNonLocalProperty() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/nonLocalProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nonLocalProperty2.kt")
             public void testNonLocalProperty2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/nonLocalProperty2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/nonLocalProperty2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInit.kt")
             public void testSimpleInit() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInit2.kt")
             public void testSimpleInit2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInit2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInit2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInitWithErrorType.kt")
             public void testSimpleInitWithErrorType() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInitWithErrorType2.kt")
             public void testSimpleInitWithErrorType2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithErrorType2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInitWithType.kt")
             public void testSimpleInitWithType() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInitWithType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("simpleInitWithType2.kt")
             public void testSimpleInitWithType2() throws Exception {
-                doTest("idea/testData/intentions/declarations/split/simpleInitWithType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/declarations/split/simpleInitWithType2.kt");
+                doTest(fileName);
             }
             
         }
@@ -3233,6 +3827,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/insertCurlyBracesToTemplate")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InsertCurlyBracesToTemplate extends AbstractIntentionTest {
         public void testAllFilesPresentInInsertCurlyBracesToTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertCurlyBracesToTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3240,37 +3835,44 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("dontInsertBrackets1.kt")
         public void testDontInsertBrackets1() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/dontInsertBrackets1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/dontInsertBrackets1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBrackets1.kt")
         public void testInsertBrackets1() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBrackets2.kt")
         public void testInsertBrackets2() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBrackets3.kt")
         public void testInsertBrackets3() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBrackets4.kt")
         public void testInsertBrackets4() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertBrackets5.kt")
         public void testInsertBrackets5() throws Exception {
-            doTest("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertCurlyBracesToTemplate/insertBrackets5.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/insertExplicitTypeArguments")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InsertExplicitTypeArguments extends AbstractIntentionTest {
         public void testAllFilesPresentInInsertExplicitTypeArguments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3278,102 +3880,122 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("inapplicableAlreadyTyped.kt")
         public void testInapplicableAlreadyTyped() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableAlreadyTyped.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNotGeneric.kt")
         public void testInapplicableNotGeneric() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNotInCallable.kt")
         public void testInapplicableNotInCallable() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNotInCallable2.kt")
         public void testInapplicableNotInCallable2() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableNotInCallable2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableTypeNotInferred.kt")
         public void testInapplicableTypeNotInferred() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/inapplicableTypeNotInferred.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertImportForArg.kt")
         public void testInsertImportForArg() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertImportForArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertManyTypes.kt")
         public void testInsertManyTypes() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertManyTypesInDifferentOrder.kt")
         public void testInsertManyTypesInDifferentOrder() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertManyTypesInDifferentOrder.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertMultipleSomeWithClashingName.kt")
         public void testInsertMultipleSomeWithClashingName() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertMultipleSomeWithClashingName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTwoTypesFun.kt")
         public void testInsertTwoTypesFun() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTwoTypesFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeAny.kt")
         public void testInsertTypeAny() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeThatIsAFunction.kt")
         public void testInsertTypeThatIsAFunction() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsAFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeThatIsATypeArg.kt")
         public void testInsertTypeThatIsATypeArg() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeThatIsATypeArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeWithClashingName.kt")
         public void testInsertTypeWithClashingName() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithClashingName.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeWithLambda.kt")
         public void testInsertTypeWithLambda() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeWithTypeArguments.kt")
         public void testInsertTypeWithTypeArguments() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithTypeArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithTypeArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("insertTypeWithVarargs.kt")
         public void testInsertTypeWithVarargs() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/insertTypeWithVarargs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInsertTypeClass.kt")
         public void testSimpleInsertTypeClass() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInsertTypeFun.kt")
         public void testSimpleInsertTypeFun() throws Exception {
-            doTest("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/insertExplicitTypeArguments/simpleInsertTypeFun.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/invertIfCondition")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InvertIfCondition extends AbstractIntentionTest {
         public void testAllFilesPresentInInvertIfCondition() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/invertIfCondition"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3381,72 +4003,86 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("assignedToValue.kt")
         public void testAssignedToValue() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/assignedToValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/assignedToValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryExpression.kt")
         public void testBinaryExpression() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/binaryExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/binaryExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("booleanLiteral.kt")
         public void testBooleanLiteral() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/booleanLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/booleanLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("branchingIfStatements.kt")
         public void testBranchingIfStatements() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/branchingIfStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/branchingIfStatements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forLoopWithMultipleExpressions.kt")
         public void testForLoopWithMultipleExpressions() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/forLoopWithMultipleExpressions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/forLoopWithMultipleExpressions.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionWithReturnExpression.kt")
         public void testFunctionWithReturnExpression() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/functionWithReturnExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/functionWithReturnExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifExpressionInsideForLoop.kt")
         public void testIfExpressionInsideForLoop() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/ifExpressionInsideForLoop.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionInsideForLoop.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifExpressionWithReturn.kt")
         public void testIfExpressionWithReturn() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/ifExpressionWithReturn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/ifExpressionWithReturn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invertableOperator.kt")
         public void testInvertableOperator() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/invertableOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/invertableOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("negatedExpression.kt")
         public void testNegatedExpression() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/negatedExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/negatedExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnIfExpression.kt")
         public void testReturnIfExpression() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/returnIfExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/returnIfExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("valueAndReturnBranches.kt")
         public void testValueAndReturnBranches() throws Exception {
-            doTest("idea/testData/intentions/invertIfCondition/valueAndReturnBranches.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/invertIfCondition/valueAndReturnBranches.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/makeTypeExplicitInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class MakeTypeExplicitInLambda extends AbstractIntentionTest {
         public void testAllFilesPresentInMakeTypeExplicitInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeExplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3454,97 +4090,116 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("coercionToUnit.kt")
         public void testCoercionToUnit() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/coercionToUnit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyParamListWithBrackets.kt")
         public void testEmptyParamListWithBrackets() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithBrackets.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithBrackets.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyParamListWithIt.kt")
         public void testEmptyParamListWithIt() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithIt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyParamListWithWhiteSpace.kt")
         public void testEmptyParamListWithWhiteSpace() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithWhiteSpace.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyParamListWithoutItWithArrow.kt")
         public void testEmptyParamListWithoutItWithArrow() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithoutItWithArrow.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/emptyParamListWithoutItWithArrow.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidCursorPosition.kt")
         public void testInvalidCursorPosition() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/invalidCursorPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/invalidCursorPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaWithLambdaAsParam.kt")
         public void testLambdaWithLambdaAsParam() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/lambdaWithLambdaAsParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("manyNewlines.kt")
         public void testManyNewlines() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/manyNewlines.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleParam.kt")
         public void testMultipleParam() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/multipleParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("paramDeclaredReturnNotDeclared.kt")
         public void testParamDeclaredReturnNotDeclared() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/paramDeclaredReturnNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/paramDeclaredReturnNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnDeclaredParamNotDeclared.kt")
         public void testReturnDeclaredParamNotDeclared() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/returnDeclaredParamNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/returnDeclaredParamNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("shortenReferencesForParams.kt")
         public void testShortenReferencesForParams() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("shortenReferencesForReceiver.kt")
         public void testShortenReferencesForReceiver() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("shortenReferencesForReturnType.kt")
         public void testShortenReferencesForReturnType() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/shortenReferencesForReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("singleParam.kt")
         public void testSingleParam() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/singleParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("singleParamWithReceiver.kt")
         public void testSingleParamWithReceiver() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/singleParamWithReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/singleParamWithReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typesAlreadyExplicit.kt")
         public void testTypesAlreadyExplicit() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/typesAlreadyExplicit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/typesAlreadyExplicit.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typesNotInferable.kt")
         public void testTypesNotInferable() throws Exception {
-            doTest("idea/testData/intentions/makeTypeExplicitInLambda/typesNotInferable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeExplicitInLambda/typesNotInferable.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/makeTypeImplicitInLambda")
+    @TestDataPath("$PROJECT_ROOT")
     public static class MakeTypeImplicitInLambda extends AbstractIntentionTest {
         public void testAllFilesPresentInMakeTypeImplicitInLambda() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeImplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3552,52 +4207,62 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("explicitReceiverType.kt")
         public void testExplicitReceiverType() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/explicitReceiverType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/explicitReceiverType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("explicitReturnType.kt")
         public void testExplicitReturnType() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/explicitReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/explicitReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidCursorPosition.kt")
         public void testInvalidCursorPosition() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/invalidCursorPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/invalidCursorPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaWithLambdaAsParam.kt")
         public void testLambdaWithLambdaAsParam() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/lambdaWithLambdaAsParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleExplicitParams.kt")
         public void testMultipleExplicitParams() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/multipleExplicitParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("paramDeclaredReturnNotDeclared.kt")
         public void testParamDeclaredReturnNotDeclared() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/paramDeclaredReturnNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/paramDeclaredReturnNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnDeclaredParamNotDeclared.kt")
         public void testReturnDeclaredParamNotDeclared() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/returnDeclaredParamNotDeclared.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/returnDeclaredParamNotDeclared.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("singleExplicitParam.kt")
         public void testSingleExplicitParam() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/singleExplicitParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typesAlreadyImplicit.kt")
         public void testTypesAlreadyImplicit() throws Exception {
-            doTest("idea/testData/intentions/makeTypeImplicitInLambda/typesAlreadyImplicit.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/makeTypeImplicitInLambda/typesAlreadyImplicit.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/moveLambdaInsideParentheses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class MoveLambdaInsideParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInMoveLambdaInsideParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaInsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3605,87 +4270,104 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("inapplicable1.kt")
         public void testInapplicable1() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicable2.kt")
         public void testInapplicable2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/inapplicable2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLabeledLambda1.kt")
         public void testMoveLabeledLambda1() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLabeledLambda2.kt")
         public void testMoveLabeledLambda2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLabeledLambda2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda1.kt")
         public void testMoveLambda1() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda10.kt")
         public void testMoveLambda10() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda10.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda11.kt")
         public void testMoveLambda11() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda11.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda12.kt")
         public void testMoveLambda12() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda12.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda2.kt")
         public void testMoveLambda2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda3.kt")
         public void testMoveLambda3() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda4.kt")
         public void testMoveLambda4() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda5.kt")
         public void testMoveLambda5() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda6.kt")
         public void testMoveLambda6() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda6.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda7.kt")
         public void testMoveLambda7() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda7.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda8.kt")
         public void testMoveLambda8() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda8.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda8.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda9.kt")
         public void testMoveLambda9() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda9.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaInsideParentheses/moveLambda9.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/moveLambdaOutsideParentheses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class MoveLambdaOutsideParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInMoveLambdaOutsideParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaOutsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3693,72 +4375,86 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("inapplicable1.kt")
         public void testInapplicable1() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicable2.kt")
         public void testInapplicable2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicable3.kt")
         public void testInapplicable3() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/inapplicable3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("labeledLambda.kt")
         public void testLabeledLambda() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/labeledLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaWithCommas.kt")
         public void testLambdaWithCommas() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaWithCommas2.kt")
         public void testLambdaWithCommas2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaWithCommas3.kt")
         public void testLambdaWithCommas3() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/lambdaWithCommas3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda1.kt")
         public void testMoveLambda1() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda2.kt")
         public void testMoveLambda2() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda3.kt")
         public void testMoveLambda3() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda4.kt")
         public void testMoveLambda4() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda7.kt")
         public void testMoveLambda7() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda7.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("moveLambda8.kt")
         public void testMoveLambda8() throws Exception {
-            doTest("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda8.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveLambdaOutsideParentheses/moveLambda8.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/operatorToFunction")
+    @TestDataPath("$PROJECT_ROOT")
     public static class OperatorToFunction extends AbstractIntentionTest {
         public void testAllFilesPresentInOperatorToFunction() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/operatorToFunction"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3766,107 +4462,128 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("arrayAccessMultipleIndex.kt")
         public void testArrayAccessMultipleIndex() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/arrayAccessMultipleIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessMultipleIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayAccessOneIndex.kt")
         public void testArrayAccessOneIndex() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/arrayAccessOneIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAccessOneIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayAssignmentMultipleIndex.kt")
         public void testArrayAssignmentMultipleIndex() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/arrayAssignmentMultipleIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/arrayAssignmentMultipleIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryEqualsEqualsNullableOperands.kt")
         public void testBinaryEqualsEqualsNullableOperands() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryEqualsEqualsNullableOperands.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryNotEqualsNonNullableOperands.kt")
         public void testBinaryNotEqualsNonNullableOperands() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryNotEqualsNonNullableOperands.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotEqualsNonNullableOperands.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryNotIn.kt")
         public void testBinaryNotIn() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryNotIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryNotIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryPlus.kt")
         public void testBinaryPlus() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryPlusEquals.kt")
         public void testBinaryPlusEquals() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryPlusEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryPlusEqualsNotResolved.kt")
         public void testBinaryPlusEqualsNotResolved() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryPlusEqualsNotResolved.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryPlusEqualsNotResolved.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("binaryRangeTo.kt")
         public void testBinaryRangeTo() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/binaryRangeTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/binaryRangeTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionCallMultipleArgument.kt")
         public void testFunctionCallMultipleArgument() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/functionCallMultipleArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallMultipleArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionCallWithMultipleArgumentsAndSingleLambda.kt")
         public void testFunctionCallWithMultipleArgumentsAndSingleLambda() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/functionCallWithMultipleArgumentsAndSingleLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithMultipleArgumentsAndSingleLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionCallWithSingleLambda.kt")
         public void testFunctionCallWithSingleLambda() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/functionCallWithSingleLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/functionCallWithSingleLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableAssignment.kt")
         public void testNotApplicableAssignment() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/notApplicableAssignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableAssignment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableCallWithInvokeMethod.kt")
         public void testNotApplicableCallWithInvokeMethod() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/notApplicableCallWithInvokeMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableCallWithInvokeMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableFunctionCallWithCallableReference.kt")
         public void testNotApplicableFunctionCallWithCallableReference() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/notApplicableFunctionCallWithCallableReference.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableFunctionCallWithCallableReference.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableNewClassObject.kt")
         public void testNotApplicableNewClassObject() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/notApplicableNewClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/notApplicableNewClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("postfixMinusMinus.kt")
         public void testPostfixMinusMinus() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/postfixMinusMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/postfixMinusMinus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("prefixPlus.kt")
         public void testPrefixPlus() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/prefixPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("prefixPlusPlus.kt")
         public void testPrefixPlusPlus() throws Exception {
-            doTest("idea/testData/intentions/operatorToFunction/prefixPlusPlus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/operatorToFunction/prefixPlusPlus.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/reconstructedType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReconstructedType extends AbstractIntentionTest {
         public void testAllFilesPresentInReconstructedType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/reconstructedType"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3874,32 +4591,38 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("completeGenericType.kt")
         public void testCompleteGenericType() throws Exception {
-            doTest("idea/testData/intentions/reconstructedType/completeGenericType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructedType/completeGenericType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("completeType.kt")
         public void testCompleteType() throws Exception {
-            doTest("idea/testData/intentions/reconstructedType/completeType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructedType/completeType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("errorType.kt")
         public void testErrorType() throws Exception {
-            doTest("idea/testData/intentions/reconstructedType/errorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructedType/errorType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("reconstructableType.kt")
         public void testReconstructableType() throws Exception {
-            doTest("idea/testData/intentions/reconstructedType/reconstructableType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructedType/reconstructableType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typeInDeclaration.kt")
         public void testTypeInDeclaration() throws Exception {
-            doTest("idea/testData/intentions/reconstructedType/typeInDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/reconstructedType/typeInDeclaration.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/removeBraces")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveBraces extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveBraces() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeBraces"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3907,67 +4630,80 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("doWhile.kt")
         public void testDoWhile() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/doWhile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doWhileWithTwoStatements.kt")
         public void testDoWhileWithTwoStatements() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/doWhileWithTwoStatements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("else.kt")
         public void testElse() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/else.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/else.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("for.kt")
         public void testFor() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/for.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/for.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithLocalVariable.kt")
         public void testForWithLocalVariable() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/forWithLocalVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/forWithLocalVariable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("if.kt")
         public void testIf() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/if.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/if.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifWithComment.kt")
         public void testIfWithComment() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/ifWithComment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithComment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifWithNoStatement.kt")
         public void testIfWithNoStatement() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/ifWithNoStatement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithNoStatement.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifWithSemicolon.kt")
         public void testIfWithSemicolon() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/ifWithSemicolon.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithSemicolon.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ifWithTwoStatements.kt")
         public void testIfWithTwoStatements() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/ifWithTwoStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/ifWithTwoStatements.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("while.kt")
         public void testWhile() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/while.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/while.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithTwoStatements.kt")
         public void testWhileWithTwoStatements() throws Exception {
-            doTest("idea/testData/intentions/removeBraces/whileWithTwoStatements.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeBraces/whileWithTwoStatements.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveCurlyBracesFromTemplate extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -3975,62 +4711,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("necessaryBrackets1.kt")
         public void testNecessaryBrackets1() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryBrackets2.kt")
         public void testNecessaryBrackets2() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryBrackets3.kt")
         public void testNecessaryBrackets3() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryBrackets4.kt")
         public void testNecessaryBrackets4() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryBrackets5.kt")
         public void testNecessaryBrackets5() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/necessaryBrackets5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets1.kt")
         public void testUnnecessaryBrackets1() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets2.kt")
         public void testUnnecessaryBrackets2() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets3.kt")
         public void testUnnecessaryBrackets3() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets4.kt")
         public void testUnnecessaryBrackets4() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets5.kt")
         public void testUnnecessaryBrackets5() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryBrackets6.kt")
         public void testUnnecessaryBrackets6() throws Exception {
-            doTest("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate/unnecessaryBrackets6.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class RemoveExplicitTypeArguments extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception {
@@ -4039,97 +4787,116 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("fourLiterals.kt")
         public void testFourLiterals() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/fourLiterals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionBodyIsCallWithUnnecessaryTypeArgs.kt")
         public void testFunctionBodyIsCallWithUnnecessaryTypeArgs() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/functionBodyIsCallWithUnnecessaryTypeArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/functionBodyIsCallWithUnnecessaryTypeArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableTypeThatIsAFunItCannotBeInferred.kt")
         public void testInapplicableTypeThatIsAFunItCannotBeInferred() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/inapplicableTypeThatIsAFunItCannotBeInferred.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaType.kt")
         public void testLambdaType() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/lambdaType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("literalAny.kt")
         public void testLiteralAny() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/literalAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("literalString.kt")
         public void testLiteralString() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/literalString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("literalStringWithClass.kt")
         public void testLiteralStringWithClass() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/literalStringWithClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalStringWithClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("literalsWhenTypeArgHasTypeArg.kt")
         public void testLiteralsWhenTypeArgHasTypeArg() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/literalsWhenTypeArgHasTypeArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalsWhenTypeArgHasTypeArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedCall-KT-5028.kt")
         public void testNestedCall_KT_5028() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/nestedCall-KT-5028.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/nestedCall-KT-5028.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableNotEnoughtInfo.kt")
         public void testNotApplicableNotEnoughtInfo() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/notApplicableNotEnoughtInfo.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableNotEnoughtInfo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableSupertypeOfInferred.kt")
         public void testNotApplicableSupertypeOfInferred() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferred.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicableSupertypeOfInferredClass.kt")
         public void testNotApplicableSupertypeOfInferredClass() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferredClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/notApplicableSupertypeOfInferredClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyInitializerIsCallWithUnnecessaryTypeArgs.kt")
         public void testPropertyInitializerIsCallWithUnnecessaryTypeArgs() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/propertyInitializerIsCallWithUnnecessaryTypeArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/propertyInitializerIsCallWithUnnecessaryTypeArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("returnCallWithUnnecessaryTypeArgs.kt")
         public void testReturnCallWithUnnecessaryTypeArgs() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/returnCallWithUnnecessaryTypeArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/returnCallWithUnnecessaryTypeArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("twoLiteralValues.kt")
         public void testTwoLiteralValues() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/twoLiteralValues.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variableString.kt")
         public void testVariableString() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/variableString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variableString2.kt")
         public void testVariableString2() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableString2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variableStringFartherScope.kt")
         public void testVariableStringFartherScope() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variableStringFartherScope.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("variablesAndLiterals.kt")
         public void testVariablesAndLiterals() throws Exception {
-            doTest("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {
@@ -4140,6 +4907,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/removeUnnecessaryParentheses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RemoveUnnecessaryParentheses extends AbstractIntentionTest {
         public void testAllFilesPresentInRemoveUnnecessaryParentheses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4147,72 +4915,86 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("necessaryParentheses1.kt")
         public void testNecessaryParentheses1() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryParentheses2.kt")
         public void testNecessaryParentheses2() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryParentheses3.kt")
         public void testNecessaryParentheses3() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryParentheses4.kt")
         public void testNecessaryParentheses4() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("necessaryParentheses5.kt")
         public void testNecessaryParentheses5() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/necessaryParentheses5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses1.kt")
         public void testUnnecessaryParentheses1() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses2.kt")
         public void testUnnecessaryParentheses2() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses3.kt")
         public void testUnnecessaryParentheses3() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses4.kt")
         public void testUnnecessaryParentheses4() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses5.kt")
         public void testUnnecessaryParentheses5() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses6.kt")
         public void testUnnecessaryParentheses6() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses6.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses7.kt")
         public void testUnnecessaryParentheses7() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unnecessaryParentheses8.kt")
         public void testUnnecessaryParentheses8() throws Exception {
-            doTest("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceExplicitFunctionLiteralParamWithIt extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceExplicitFunctionLiteralParamWithIt() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4220,47 +5002,56 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("applicable_cursofOverParamInInnerLiteral.kt")
         public void testApplicable_cursofOverParamInInnerLiteral() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursofOverParamInInnerLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursofOverParamInInnerLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("applicable_cursorOverParameterDeclaration.kt")
         public void testApplicable_cursorOverParameterDeclaration() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterDeclaration.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("applicable_cursorOverParameterUse.kt")
         public void testApplicable_cursorOverParameterUse() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_cursorOverParameterUse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("applicable_formatsProperly.kt")
         public void testApplicable_formatsProperly() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_formatsProperly.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/applicable_formatsProperly.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_alreadyUsesImplicitIt.kt")
         public void testNotApplicable_alreadyUsesImplicitIt() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_alreadyUsesImplicitIt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_hasMultipleParameters.kt")
         public void testNotApplicable_hasMultipleParameters() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_hasMultipleParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_hasMultipleParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_notFunctionLiteralParameter.kt")
         public void testNotApplicable_notFunctionLiteralParameter() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_notFunctionLiteralParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_notFunctionLiteralParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_parameterHasExplicitType.kt")
         public void testNotApplicable_parameterHasExplicitType() throws Exception {
-            doTest("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_parameterHasExplicitType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/notApplicable_parameterHasExplicitType.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceItWithExplicitFunctionLiteralParam extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceItWithExplicitFunctionLiteralParam() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4268,32 +5059,38 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("applicable.kt")
         public void testApplicable() throws Exception {
-            doTest("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("applicable_nestedFunctionLiterals.kt")
         public void testApplicable_nestedFunctionLiterals() throws Exception {
-            doTest("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionLiterals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionLiterals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("applicable_nestedFunctionWithIt.kt")
         public void testApplicable_nestedFunctionWithIt() throws Exception {
-            doTest("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionWithIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/applicable_nestedFunctionWithIt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_localVariableIt.kt")
         public void testNotApplicable_localVariableIt() throws Exception {
-            doTest("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_localVariableIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_localVariableIt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notApplicable_parameterExplicitlyNamedIt.kt")
         public void testNotApplicable_parameterExplicitlyNamedIt() throws Exception {
-            doTest("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_parameterExplicitlyNamedIt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/notApplicable_parameterExplicitlyNamedIt.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceWithDotQualifiedMethodCall extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithDotQualifiedMethodCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithDotQualifiedMethodCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4301,37 +5098,44 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("functionCallAfterInfixCall.kt")
         public void testFunctionCallAfterInfixCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionCallAfterInfixCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralArgument.kt")
         public void testFunctionLiteralArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/functionLiteralArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonApplicableBinaryOperation.kt")
         public void testNonApplicableBinaryOperation() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nonApplicableBinaryOperation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nonApplicableBinaryOperation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullAssertedCall.kt")
         public void testNullAssertedCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/nullAssertedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesesAroundRightHandArgument.kt")
         public void testParenthesesAroundRightHandArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/parenthesesAroundRightHandArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInfixFunctionCall.kt")
         public void testSimpleInfixFunctionCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall/simpleInfixFunctionCall.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceWithInfixFunctionCall")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceWithInfixFunctionCall extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithInfixFunctionCall() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithInfixFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4339,102 +5143,122 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("binaryExpressionArgument.kt")
         public void testBinaryExpressionArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/binaryExpressionArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/binaryExpressionArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("caretInsideCalleeExpr.kt")
         public void testCaretInsideCalleeExpr() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/caretInsideCalleeExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/caretInsideCalleeExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("caretInsideReceiverExpr.kt")
         public void testCaretInsideReceiverExpr() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/caretInsideReceiverExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/caretInsideReceiverExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleFunctionCall.kt")
         public void testDoubleFunctionCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/doubleFunctionCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/doubleFunctionCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleFunctionCallWithoutParentheses.kt")
         public void testDoubleFunctionCallWithoutParentheses() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/doubleFunctionCallWithoutParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/doubleFunctionCallWithoutParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("firstParameterLabeled.kt")
         public void testFirstParameterLabeled() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/firstParameterLabeled.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/firstParameterLabeled.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionLiteralArgument.kt")
         public void testFunctionLiteralArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/functionLiteralArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/functionLiteralArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionSafeCall.kt")
         public void testFunctionSafeCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/functionSafeCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/functionSafeCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableCaretPosition.kt")
         public void testInapplicableCaretPosition() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/inapplicableCaretPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/inapplicableCaretPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleArguments.kt")
         public void testMultipleArguments() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/multipleArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/multipleArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("namedArgument.kt")
         public void testNamedArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/namedArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/namedArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullAssertedReceiver.kt")
         public void testNullAssertedReceiver() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/nullAssertedReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/nullAssertedReceiver.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFunctionCall.kt")
         public void testPackageFunctionCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/packageFunctionCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/packageFunctionCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("propertyAccess.kt")
         public void testPropertyAccess() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/propertyAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/propertyAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("secondParameterLabeled.kt")
         public void testSecondParameterLabeled() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/secondParameterLabeled.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/secondParameterLabeled.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleArgumentAndFunctionLiteralArgument.kt")
         public void testSimpleArgumentAndFunctionLiteralArgument() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/simpleArgumentAndFunctionLiteralArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/simpleArgumentAndFunctionLiteralArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleMethodCall.kt")
         public void testSimpleMethodCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/simpleMethodCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/simpleMethodCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("singlePackageFunctionCall.kt")
         public void testSinglePackageFunctionCall() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/singlePackageFunctionCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/singlePackageFunctionCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("zeroArguments.kt")
         public void testZeroArguments() throws Exception {
-            doTest("idea/testData/intentions/replaceWithInfixFunctionCall/zeroArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithInfixFunctionCall/zeroArguments.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceWithOperatorAssign")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceWithOperatorAssign extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithOperatorAssign() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssign"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4442,52 +5266,62 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("illegalMultipleOperators.kt")
         public void testIllegalMultipleOperators() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperators.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("illegalMultipleOperatorsMiddle.kt")
         public void testIllegalMultipleOperatorsMiddle() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/illegalMultipleOperatorsMiddle.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidSubtraction.kt")
         public void testInvalidSubtraction() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/invalidSubtraction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperators.kt")
         public void testMultipleOperators() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperators.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperatorsRightSideRepeat.kt")
         public void testMultipleOperatorsRightSideRepeat() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/multipleOperatorsRightSideRepeat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonRepeatingAssignment.kt")
         public void testNonRepeatingAssignment() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/nonRepeatingAssignment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rightSideRepeat.kt")
         public void testRightSideRepeat() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/rightSideRepeat.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleAssign.kt")
         public void testSimpleAssign() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/simpleAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("validSubtraction.kt")
         public void testValidSubtraction() throws Exception {
-            doTest("idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithOperatorAssign/validSubtraction.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/replaceWithTraditionalAssignment")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReplaceWithTraditionalAssignment extends AbstractIntentionTest {
         public void testAllFilesPresentInReplaceWithTraditionalAssignment() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithTraditionalAssignment"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4495,27 +5329,32 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("complexRightExpression.kt")
         public void testComplexRightExpression() throws Exception {
-            doTest("idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/complexRightExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonAssignmentExpression.kt")
         public void testNonAssignmentExpression() throws Exception {
-            doTest("idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/nonAssignmentExpression.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonAugmentedAssign.kt")
         public void testNonAugmentedAssign() throws Exception {
-            doTest("idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/nonAugmentedAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/replaceWithTraditionalAssignment/simple.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/simplifyBooleanWithConstants")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SimplifyBooleanWithConstants extends AbstractIntentionTest {
         public void testAllFilesPresentInSimplifyBooleanWithConstants() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyBooleanWithConstants"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4523,107 +5362,128 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("deeplyParenthesized.kt")
         public void testDeeplyParenthesized() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/deeplyParenthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/deeplyParenthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNoConstants.kt")
         public void testInapplicableNoConstants() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNoConstants.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNoConstants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableNotBinary.kt")
         public void testInapplicableNotBinary() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNotBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableNotBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableUsesVals.kt")
         public void testInapplicableUsesVals() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableUsesVals2.kt")
         public void testInapplicableUsesVals2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableUsesVals3.kt")
         public void testInapplicableUsesVals3() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/inapplicableUsesVals3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("reduceableBinary.kt")
         public void testReduceableBinary() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("reduceableBinary2.kt")
         public void testReduceableBinary2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("reduceableBinary3.kt")
         public void testReduceableBinary3() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinary3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("reduceableBinaryWithParenthese.kt")
         public void testReduceableBinaryWithParenthese() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/reduceableBinaryWithParenthese.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinaries.kt")
         public void testSimpleWithMoreBinaries() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinaries2.kt")
         public void testSimpleWithMoreBinaries2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinaries3.kt")
         public void testSimpleWithMoreBinaries3() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinaries3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinariesAndParentheses.kt")
         public void testSimpleWithMoreBinariesAndParentheses() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinariesAndParentheses2.kt")
         public void testSimpleWithMoreBinariesAndParentheses2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithMoreBinariesAndParentheses3.kt")
         public void testSimpleWithMoreBinariesAndParentheses3() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithMoreBinariesAndParentheses3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithNonsensical2.kt")
         public void testSimpleWithNonsensical2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithNonsensical2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithNonsensical2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithParentheses.kt")
         public void testSimpleWithParentheses() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleWithParentheses2.kt")
         public void testSimpleWithParentheses2() throws Exception {
-            doTest("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyBooleanWithConstants/simpleWithParentheses2.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class SimplifyNegatedBinaryExpressionIntention extends AbstractIntentionTest {
         public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception {
@@ -4632,62 +5492,74 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/equals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThan.kt")
         public void testGreaterThan() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThan.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThan.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThanOrEquals.kt")
         public void testGreaterThanOrEquals() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThanOrEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThanOrEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("in.kt")
         public void testIn() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/in.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/in.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("inapplicableBinaryOperation.kt")
         public void testInapplicableBinaryOperation() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inapplicableBinaryOperation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inapplicableBinaryOperation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("is.kt")
         public void testIs() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/is.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/is.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThan.kt")
         public void testLessThan() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThan.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThan.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThanOrEquals.kt")
         public void testLessThanOrEquals() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThanOrEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThanOrEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notEquals.kt")
         public void testNotEquals() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIn.kt")
         public void testNotIn() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIs.kt")
         public void testNotIs() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInvert.kt")
         public void testSimpleInvert() throws Exception {
-            doTest("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/simpleInvert.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/simpleInvert.kt");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {
@@ -4698,6 +5570,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
     }
     
     @TestMetadata("idea/testData/intentions/specifyType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SpecifyType extends AbstractIntentionTest {
         public void testAllFilesPresentInSpecifyType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyType"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4705,67 +5578,80 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("badCaretPosition.kt")
         public void testBadCaretPosition() throws Exception {
-            doTest("idea/testData/intentions/specifyType/badCaretPosition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/badCaretPosition.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classNameClashing.kt")
         public void testClassNameClashing() throws Exception {
-            doTest("idea/testData/intentions/specifyType/classNameClashing.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/classNameClashing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enumType.kt")
         public void testEnumType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/enumType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/enumType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("functionType.kt")
         public void testFunctionType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/functionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/functionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("loopParameter.kt")
         public void testLoopParameter() throws Exception {
-            doTest("idea/testData/intentions/specifyType/loopParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/loopParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("onType.kt")
         public void testOnType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/onType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/onType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("publicMember.kt")
         public void testPublicMember() throws Exception {
-            doTest("idea/testData/intentions/specifyType/publicMember.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/publicMember.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("removeUnresolvedType.kt")
         public void testRemoveUnresolvedType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/removeUnresolvedType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/removeUnresolvedType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("stringRedefined.kt")
         public void testStringRedefined() throws Exception {
-            doTest("idea/testData/intentions/specifyType/stringRedefined.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/stringRedefined.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("typeAlreadyProvided.kt")
         public void testTypeAlreadyProvided() throws Exception {
-            doTest("idea/testData/intentions/specifyType/typeAlreadyProvided.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/typeAlreadyProvided.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unitType.kt")
         public void testUnitType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/unitType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/unitType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("unknownType.kt")
         public void testUnknownType() throws Exception {
-            doTest("idea/testData/intentions/specifyType/unknownType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/specifyType/unknownType.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/splitIf")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SplitIf extends AbstractIntentionTest {
         public void testAllFilesPresentInSplitIf() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4773,127 +5659,152 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("splitIfAndOr.kt")
         public void testSplitIfAndOr() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfAndOr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfAndOr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfAndOrWithBraces.kt")
         public void testSplitIfAndOrWithBraces() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfAndOrWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfAndOrWithBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfAndWithBraces.kt")
         public void testSplitIfAndWithBraces() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfAndWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfAndWithBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfCaretOnIf.kt")
         public void testSplitIfCaretOnIf() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfCaretOnIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfCaretOnIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfNestedIf.kt")
         public void testSplitIfNestedIf() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfNestedIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfNestedIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfNestedIfNotApplicable.kt")
         public void testSplitIfNestedIfNotApplicable() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfNestedIfNotApplicable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfNestedIfNotApplicable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfNestedInside.kt")
         public void testSplitIfNestedInside() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfNestedInside.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfNestedInside.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfNestedOutside.kt")
         public void testSplitIfNestedOutside() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfNestedOutside.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfNestedOutside.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfNotIf.kt")
         public void testSplitIfNotIf() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfNotIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfNotIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOnIfWithOr.kt")
         public void testSplitIfOnIfWithOr() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOnIfWithOr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOnIfWithOr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOneAND.kt")
         public void testSplitIfOneAND() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOneAND.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOneAND.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOperatorAsFunctionParam.kt")
         public void testSplitIfOperatorAsFunctionParam() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOperatorAsFunctionParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOperatorAsFunctionParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOperatorOutsideIf.kt")
         public void testSplitIfOperatorOutsideIf() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOperatorOutsideIf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOperatorOutsideIf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOrAnd.kt")
         public void testSplitIfOrAnd() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOrAnd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOrAnd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfOrWithBraces.kt")
         public void testSplitIfOrWithBraces() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfOrWithBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfOrWithBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfTwoOperatorsFirst.kt")
         public void testSplitIfTwoOperatorsFirst() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfTwoOperatorsFirst.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfTwoOperatorsFirst.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfTwoOperatorsSecond.kt")
         public void testSplitIfTwoOperatorsSecond() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfTwoOperatorsSecond.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfTwoOperatorsSecond.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithElse.kt")
         public void testSplitIfWithElse() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithFunction.kt")
         public void testSplitIfWithFunction() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithNotOperator.kt")
         public void testSplitIfWithNotOperator() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithNotOperator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithNotOperator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithNotOperatorGood.kt")
         public void testSplitIfWithNotOperatorGood() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithNotOperatorGood.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithNotOperatorGood.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithOR.kt")
         public void testSplitIfWithOR() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithOR.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithOR.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWithORElse.kt")
         public void testSplitIfWithORElse() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWithORElse.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWithORElse.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("splitIfWrongCaretLocation.kt")
         public void testSplitIfWrongCaretLocation() throws Exception {
-            doTest("idea/testData/intentions/splitIf/splitIfWrongCaretLocation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/splitIf/splitIfWrongCaretLocation.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/intentions/swapBinaryExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SwapBinaryExpression extends AbstractIntentionTest {
         public void testAllFilesPresentInSwapBinaryExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/swapBinaryExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -4901,257 +5812,308 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         
         @TestMetadata("assignment.kt")
         public void testAssignment() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/assignment.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/assignment.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compareTo.kt")
         public void testCompareTo() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/compareTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/compareTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunction.kt")
         public void testConjunction() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/conjunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("conjunctionLiteral.kt")
         public void testConjunctionLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/conjunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/conjunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunction.kt")
         public void testDisjunction() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/disjunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunctionLiteral.kt")
         public void testDisjunctionLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/disjunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/disjunctionLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("divide.kt")
         public void testDivide() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/divide.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divide.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("divideAssign.kt")
         public void testDivideAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/divideAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("divideLiteral.kt")
         public void testDivideLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/divideLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/divideLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("equals.kt")
         public void testEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/equals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("equalsLiteral.kt")
         public void testEqualsLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/equalsLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/equalsLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThan.kt")
         public void testGreaterThan() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/greaterThan.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThan.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThanEquals.kt")
         public void testGreaterThanEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/greaterThanEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/greaterThanEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("identityEquals.kt")
         public void testIdentityEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/identityEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("identityEqualsLiteral.kt")
         public void testIdentityEqualsLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/identityEqualsLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/identityEqualsLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("in.kt")
         public void testIn() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/in.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/in.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("infixFunction.kt")
         public void testInfixFunction() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/infixFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/infixFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("is.kt")
         public void testIs() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/is.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/is.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThan.kt")
         public void testLessThan() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/lessThan.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThan.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThanEquals.kt")
         public void testLessThanEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/lessThanEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/lessThanEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("minus.kt")
         public void testMinus() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/minus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("minusAssign.kt")
         public void testMinusAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/minusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("minusLiteral.kt")
         public void testMinusLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/minusLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/minusLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperands.kt")
         public void testMultipleOperands() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperands.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperands.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence.kt")
         public void testMultipleOperandsWithDifferentPrecedence() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence2.kt")
         public void testMultipleOperandsWithDifferentPrecedence2() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence3.kt")
         public void testMultipleOperandsWithDifferentPrecedence3() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence4.kt")
         public void testMultipleOperandsWithDifferentPrecedence4() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence5.kt")
         public void testMultipleOperandsWithDifferentPrecedence5() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multipleOperandsWithDifferentPrecedence6.kt")
         public void testMultipleOperandsWithDifferentPrecedence6() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multipleOperandsWithDifferentPrecedence6.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multiply.kt")
         public void testMultiply() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multiply.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiply.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplyAssign.kt")
         public void testMultiplyAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/multiplyAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/multiplyAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonBinaryExpr.kt")
         public void testNonBinaryExpr() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nonBinaryExpr.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notEquals.kt")
         public void testNotEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/notEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIdentityEquals.kt")
         public void testNotIdentityEquals() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/notIdentityEquals.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIdentityEquals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIn.kt")
         public void testNotIn() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/notIn.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIn.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("notIs.kt")
         public void testNotIs() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/notIs.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/notIs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nullOperand.kt")
         public void testNullOperand() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/nullOperand.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/nullOperand.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plus.kt")
         public void testPlus() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/plus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plusAssign.kt")
         public void testPlusAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/plusAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plusInt.kt")
         public void testPlusInt() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/plusInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plusLiteral.kt")
         public void testPlusLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/plusLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("plusMinus.kt")
         public void testPlusMinus() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/plusMinus.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/plusMinus.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rangeTo.kt")
         public void testRangeTo() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/rangeTo.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeTo.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("rangeToLiteral.kt")
         public void testRangeToLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/rangeToLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/rangeToLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("remainder.kt")
         public void testRemainder() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/remainder.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainder.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("remainderAssign.kt")
         public void testRemainderAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/remainderAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/remainderAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("times.kt")
         public void testTimes() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/times.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/times.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("timesAssign.kt")
         public void testTimesAssign() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/timesAssign.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesAssign.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("timesLiteral.kt")
         public void testTimesLiteral() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/timesLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/timesLiteral.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("xor.kt")
         public void testXor() throws Exception {
-            doTest("idea/testData/intentions/swapBinaryExpression/xor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/swapBinaryExpression/xor.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java
index 645fab630ae..e86f50b6a8b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.intentions.declarations;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/joinLines")
+@TestDataPath("$PROJECT_ROOT")
 public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
     public void testAllFilesPresentInJoinLines() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,72 +37,86 @@ public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
     
     @TestMetadata("longInit.kt")
     public void testLongInit() throws Exception {
-        doTest("idea/testData/joinLines/longInit.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/longInit.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("longInit2.kt")
     public void testLongInit2() throws Exception {
-        doTest("idea/testData/joinLines/longInit2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/longInit2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInit.kt")
     public void testSimpleInit() throws Exception {
-        doTest("idea/testData/joinLines/simpleInit.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInit.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInit2.kt")
     public void testSimpleInit2() throws Exception {
-        doTest("idea/testData/joinLines/simpleInit2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInit2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithBackticks.kt")
     public void testSimpleInitWithBackticks() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithBackticks.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithBackticks.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithBackticks2.kt")
     public void testSimpleInitWithBackticks2() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithBackticks2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithBackticks2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithBackticks3.kt")
     public void testSimpleInitWithBackticks3() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithBackticks3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithBackticks3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithComments.kt")
     public void testSimpleInitWithComments() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithComments.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithComments.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithComments2.kt")
     public void testSimpleInitWithComments2() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithComments2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithComments2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithSemicolons.kt")
     public void testSimpleInitWithSemicolons() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithSemicolons.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithSemicolons.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithSemicolons2.kt")
     public void testSimpleInitWithSemicolons2() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithSemicolons2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithSemicolons2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithSemicolons3.kt")
     public void testSimpleInitWithSemicolons3() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithSemicolons3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithSemicolons3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithType.kt")
     public void testSimpleInitWithType() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("simpleInitWithType2.kt")
     public void testSimpleInitWithType2() throws Exception {
-        doTest("idea/testData/joinLines/simpleInitWithType2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/joinLines/simpleInitWithType2.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java
index 1e612b60eed..bb934e556db 100644
--- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.libraries;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/libraries/decompiledText")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({})
 public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest {
     public void testAllFilesPresentInDecompiledText() throws Exception {
@@ -36,42 +38,50 @@ public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest {
     
     @TestMetadata("Annotations")
     public void testAnnotations() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/Annotations/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Annotations/");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassWithClassObject")
     public void testClassWithClassObject() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/ClassWithClassObject/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/ClassWithClassObject/");
+        doTest(fileName);
     }
     
     @TestMetadata("DependencyOnNestedClasses")
     public void testDependencyOnNestedClasses() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/DependencyOnNestedClasses/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/DependencyOnNestedClasses/");
+        doTest(fileName);
     }
     
     @TestMetadata("Enum")
     public void testEnum() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/Enum/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Enum/");
+        doTest(fileName);
     }
     
     @TestMetadata("NestedClasses")
     public void testNestedClasses() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/NestedClasses/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/NestedClasses/");
+        doTest(fileName);
     }
     
     @TestMetadata("Object")
     public void testObject() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/Object/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/Object/");
+        doTest(fileName);
     }
     
     @TestMetadata("SimpleClass")
     public void testSimpleClass() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/SimpleClass/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/SimpleClass/");
+        doTest(fileName);
     }
     
     @TestMetadata("TestPackage")
     public void testTestPackage() throws Exception {
-        doTest("idea/testData/libraries/decompiledText/TestPackage/");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/libraries/decompiledText/TestPackage/");
+        doTest(fileName);
     }
     
     public static Test suite() {
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java
index ee203ad1b97..5dc0ed063ba 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.navigation;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/navigation/gotoSuper")
+@TestDataPath("$PROJECT_ROOT")
 public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
     public void testAllFilesPresentInGotoSuper() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true);
@@ -35,52 +37,62 @@ public class GotoSuperTestGenerated extends AbstractGotoSuperTest {
     
     @TestMetadata("ClassSimple.test")
     public void testClassSimple() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/ClassSimple.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ClassSimple.test");
+        doTest(fileName);
     }
     
     @TestMetadata("DelegatedFun.test")
     public void testDelegatedFun() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/DelegatedFun.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedFun.test");
+        doTest(fileName);
     }
     
     @TestMetadata("DelegatedProperty.test")
     public void testDelegatedProperty() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/DelegatedProperty.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/DelegatedProperty.test");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeOverrideFun.test")
     public void testFakeOverrideFun() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/FakeOverrideFun.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFun.test");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeOverrideFunWithMostRelevantImplementation.test")
     public void testFakeOverrideFunWithMostRelevantImplementation() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/FakeOverrideFunWithMostRelevantImplementation.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideFunWithMostRelevantImplementation.test");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeOverrideProperty.test")
     public void testFakeOverrideProperty() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/FakeOverrideProperty.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FakeOverrideProperty.test");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionSimple.test")
     public void testFunctionSimple() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/FunctionSimple.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/FunctionSimple.test");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectSimple.test")
     public void testObjectSimple() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/ObjectSimple.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/ObjectSimple.test");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertySimple.test")
     public void testPropertySimple() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/PropertySimple.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/PropertySimple.test");
+        doTest(fileName);
     }
     
     @TestMetadata("TraitSimple.test")
     public void testTraitSimple() throws Exception {
-        doTest("idea/testData/navigation/gotoSuper/TraitSimple.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSuper/TraitSimple.test");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java
index bbea88188b3..7acb31808b6 100644
--- a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.navigation;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({KotlinGotoTestGenerated.GotoClass.class, KotlinGotoTestGenerated.GotoSymbol.class})
 public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
     @TestMetadata("idea/testData/navigation/gotoClass")
+    @TestDataPath("$PROJECT_ROOT")
     public static class GotoClass extends AbstractKotlinGotoTest {
         public void testAllFilesPresentInGotoClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,47 +39,56 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
         
         @TestMetadata("enumEntries.kt")
         public void testEnumEntries() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/enumEntries.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/enumEntries.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("inClassObject.kt")
         public void testInClassObject() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/inClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/inClassObject.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("innerClass.kt")
         public void testInnerClass() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/innerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/innerClass.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("localDeclarations.kt")
         public void testLocalDeclarations() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/localDeclarations.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/localDeclarations.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("noImplementationTrait.kt")
         public void testNoImplementationTrait() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/noImplementationTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/noImplementationTrait.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("simpleClass.kt")
         public void testSimpleClass() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/simpleClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleClass.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("simpleObject.kt")
         public void testSimpleObject() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/simpleObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/simpleObject.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("traitWithFunImplement.kt")
         public void testTraitWithFunImplement() throws Exception {
-            doClassTest("idea/testData/navigation/gotoClass/traitWithFunImplement.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoClass/traitWithFunImplement.kt");
+            doClassTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/navigation/gotoSymbol")
+    @TestDataPath("$PROJECT_ROOT")
     public static class GotoSymbol extends AbstractKotlinGotoTest {
         public void testAllFilesPresentInGotoSymbol() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -85,32 +96,38 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest {
         
         @TestMetadata("functions.kt")
         public void testFunctions() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/functions.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/functions.kt");
+            doSymbolTest(fileName);
         }
         
         @TestMetadata("javaMethods.kt")
         public void testJavaMethods() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/javaMethods.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/javaMethods.kt");
+            doSymbolTest(fileName);
         }
         
         @TestMetadata("properties.kt")
         public void testProperties() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/properties.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/properties.kt");
+            doSymbolTest(fileName);
         }
         
         @TestMetadata("stdLibArrayListOf.kt")
         public void testStdLibArrayListOf() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOf.kt");
+            doSymbolTest(fileName);
         }
         
         @TestMetadata("stdLibArrayListOfNoSources.kt")
         public void testStdLibArrayListOfNoSources() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibArrayListOfNoSources.kt");
+            doSymbolTest(fileName);
         }
         
         @TestMetadata("stdLibJoinToString.kt")
         public void testStdLibJoinToString() throws Exception {
-            doSymbolTest("idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/navigation/gotoSymbol/stdLibJoinToString.kt");
+            doSymbolTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java
index 5f8e8113953..aabc0e386a9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.parameterInfo;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/parameterInfo/functionParameterInfo")
+@TestDataPath("$PROJECT_ROOT")
 public class FunctionParameterInfoTestGenerated extends AbstractFunctionParameterInfoTest {
     public void testAllFilesPresentInFunctionParameterInfo() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionParameterInfo"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,77 +37,92 @@ public class FunctionParameterInfoTestGenerated extends AbstractFunctionParamete
     
     @TestMetadata("Deprecated.kt")
     public void testDeprecated() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/Deprecated.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/Deprecated.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ExtensionOnClassObject.kt")
     public void testExtensionOnClassObject() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/ExtensionOnClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedFunctions.kt")
     public void testInheritedFunctions() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/InheritedFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedWithCurrentFunctions.kt")
     public void testInheritedWithCurrentFunctions() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/InheritedWithCurrentFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedAndDefaultParameter.kt")
     public void testNamedAndDefaultParameter() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/NamedAndDefaultParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedParameter.kt")
     public void testNamedParameter() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/NamedParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedParameter2.kt")
     public void testNamedParameter2() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/NamedParameter2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotGreen.kt")
     public void testNotGreen() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/NotGreen.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NullableTypeCall.kt")
     public void testNullableTypeCall() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/NullableTypeCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Println.kt")
     public void testPrintln() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/Println.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/Println.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Simple.kt")
     public void testSimple() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/Simple.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/Simple.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SimpleConstructor.kt")
     public void testSimpleConstructor() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/SimpleConstructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SuperConstructorCall.kt")
     public void testSuperConstructorCall() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/SuperConstructorCall.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TwoFunctions.kt")
     public void testTwoFunctions() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/TwoFunctions.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TwoFunctionsGrey.kt")
     public void testTwoFunctionsGrey() throws Exception {
-        doTest("idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/parameterInfo/functionParameterInfo/TwoFunctionsGrey.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
index ec12e41c8bb..baa369fcd45 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/quickfix")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.CreateFromUsage.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.Nullables.class, QuickFixMultiFileTestGenerated.Override.class, QuickFixMultiFileTestGenerated.Suppress.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.TypeMismatch.class, QuickFixMultiFileTestGenerated.Variables.class})
 public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
@@ -35,6 +37,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/addStarProjections")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class AddStarProjections extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInAddStarProjections() throws Exception {
@@ -49,6 +52,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/autoImports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AutoImports extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInAutoImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -56,132 +60,158 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         
         @TestMetadata("classImport.before.Main.kt")
         public void testClassImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/classImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/classImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("divOperator.before.Main.kt")
         public void testDivOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/divOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/divOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("extensionFunctionImport.before.Main.kt")
         public void testExtensionFunctionImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/extensionFunctionImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionFunctionImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("extensionPropertyImport.before.Main.kt")
         public void testExtensionPropertyImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/extensionPropertyImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/extensionPropertyImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("functionImport.before.Main.kt")
         public void testFunctionImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/functionImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/functionImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("importInFirstPartInQualifiedExpression.before.Main.kt")
         public void testImportInFirstPartInQualifiedExpression() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInQualifiedExpression.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("importInFirstPartInUserType.before.Main.kt")
         public void testImportInFirstPartInUserType() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importInFirstPartInUserType.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("importTrait.before.Main.kt")
         public void testImportTrait() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/importTrait.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/importTrait.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("infixCall.before.Main.kt")
         public void testInfixCall() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/infixCall.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/infixCall.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("minusOperator.before.Main.kt")
         public void testMinusOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/minusOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/minusOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportForFunInQualifiedNotFirst.before.Main.kt")
         public void testNoImportForFunInQualifiedNotFirst() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForFunInQualifiedNotFirst.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportForPrivateClass.before.Main.kt")
         public void testNoImportForPrivateClass() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportForPrivateClass.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportInImports.before.Main.kt")
         public void testNoImportInImports() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInImports.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportInQualifiedExpressionNotFirst.before.Main.kt")
         public void testNoImportInQualifiedExpressionNotFirst() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedExpressionNotFirst.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportInQualifiedUserTypeNotFirst.before.Main.kt")
         public void testNoImportInQualifiedUserTypeNotFirst() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInQualifiedUserTypeNotFirst.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("noImportInSafeQualifiedExpressionNotFirst.before.Main.kt")
         public void testNoImportInSafeQualifiedExpressionNotFirst() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/noImportInSafeQualifiedExpressionNotFirst.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("objectImport.before.Main.kt")
         public void testObjectImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/objectImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/objectImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("packageClass.before.Main.kt")
         public void testPackageClass() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/packageClass.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/packageClass.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("plusOperator.before.Main.kt")
         public void testPlusOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/plusOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/plusOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("postfixOperator.before.Main.kt")
         public void testPostfixOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/postfixOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/postfixOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("propertyImport.before.Main.kt")
         public void testPropertyImport() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/propertyImport.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/propertyImport.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("timesAssign.before.Main.kt")
         public void testTimesAssign() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/timesAssign.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/timesAssign.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("unaryMinusOperator.before.Main.kt")
         public void testUnaryMinusOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryMinusOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("unaryPlusOperator.before.Main.kt")
         public void testUnaryPlusOperator() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unaryPlusOperator.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
         @TestMetadata("withAutoCastedQualifier.before.Main.kt")
         public void testWithAutoCastedQualifier() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/autoImports/withAutoCastedQualifier.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/withAutoCastedQualifier.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/createFromUsage")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class CreateFromUsage extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInCreateFromUsage() throws Exception {
@@ -196,6 +226,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/modifiers")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class})
     public static class Modifiers extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInModifiers() throws Exception {
@@ -203,6 +234,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         }
         
         @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class})
         public static class AddOpenToClassDeclaration extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception {
@@ -210,6 +242,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             }
             
             @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({FinalJavaClass.JavaCode.class})
             public static class FinalJavaClass extends AbstractQuickFixMultiFileTest {
                 public void testAllFilesPresentInFinalJavaClass() throws Exception {
@@ -217,6 +250,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
                 }
                 
                 @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode")
+                @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({})
                 public static class JavaCode extends AbstractQuickFixMultiFileTest {
                     public void testAllFilesPresentInJavaCode() throws Exception {
@@ -255,6 +289,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/nullables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class Nullables extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInNullables() throws Exception {
@@ -269,6 +304,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/override")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Override.NothingToOverride.class})
     public static class Override extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInOverride() throws Exception {
@@ -276,6 +312,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         }
         
         @TestMetadata("idea/testData/quickfix/override/nothingToOverride")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NothingToOverride extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInNothingToOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -283,12 +320,14 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
             
             @TestMetadata("import.before.Main.kt")
             public void testImport() throws Exception {
-                doTestWithExtraFile("idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/import.before.Main.kt");
+                doTestWithExtraFile(fileName);
             }
             
             @TestMetadata("twoPackages.before.Main.kt")
             public void testTwoPackages() throws Exception {
-                doTestWithExtraFile("idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/twoPackages.before.Main.kt");
+                doTestWithExtraFile(fileName);
             }
             
         }
@@ -302,6 +341,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/suppress")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Suppress.ForStatement.class})
     public static class Suppress extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInSuppress() throws Exception {
@@ -309,6 +349,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/forStatement")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({})
         public static class ForStatement extends AbstractQuickFixMultiFileTest {
             public void testAllFilesPresentInForStatement() throws Exception {
@@ -331,6 +372,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/typeImports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeImports extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInTypeImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true);
@@ -338,12 +380,14 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
         
         @TestMetadata("importFromAnotherFile.before.Main.kt")
         public void testImportFromAnotherFile() throws Exception {
-            doTestWithExtraFile("idea/testData/quickfix/typeImports/importFromAnotherFile.before.Main.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/importFromAnotherFile.before.Main.kt");
+            doTestWithExtraFile(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/typeMismatch")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class TypeMismatch extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInTypeMismatch() throws Exception {
@@ -358,6 +402,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes
     }
     
     @TestMetadata("idea/testData/quickfix/variables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class Variables extends AbstractQuickFixMultiFileTest {
         public void testAllFilesPresentInVariables() throws Exception {
diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
index 2a777ee52e0..cc4e9ccb9bb 100644
--- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/quickfix")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({QuickFixTestGenerated.Abstract.class, QuickFixTestGenerated.AddStarProjections.class, QuickFixTestGenerated.AutoImports.class, QuickFixTestGenerated.ChangeSignature.class, QuickFixTestGenerated.CheckArguments.class, QuickFixTestGenerated.CreateFromUsage.class, QuickFixTestGenerated.Expressions.class, QuickFixTestGenerated.Migration.class, QuickFixTestGenerated.Modifiers.class, QuickFixTestGenerated.Nullables.class, QuickFixTestGenerated.Override.class, QuickFixTestGenerated.PlatformClasses.class, QuickFixTestGenerated.Supercalls.class, QuickFixTestGenerated.SupertypeInitialization.class, QuickFixTestGenerated.Suppress.class, QuickFixTestGenerated.TypeAddition.class, QuickFixTestGenerated.TypeImports.class, QuickFixTestGenerated.TypeMismatch.class, QuickFixTestGenerated.TypeProjection.class, QuickFixTestGenerated.UselessImports.class, QuickFixTestGenerated.Variables.class, QuickFixTestGenerated.When.class})
 public class QuickFixTestGenerated extends AbstractQuickFixTest {
     public void testAllFilesPresentInQuickfix() throws Exception {
@@ -35,75 +37,90 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/abstract")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Abstract extends AbstractQuickFixTest {
         @TestMetadata("beforeAbstractFunctionInNonAbstractClass.kt")
         public void testAbstractFunctionInNonAbstractClass() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractFunctionInNonAbstractClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionInNonAbstractClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractFunctionWithBody.kt")
         public void testAbstractFunctionWithBody() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractFunctionWithBody2.kt")
         public void testAbstractFunctionWithBody2() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractFunctionWithBody3.kt")
         public void testAbstractFunctionWithBody3() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractFunctionWithBody3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyInNonAbstractClass1.kt")
         public void testAbstractPropertyInNonAbstractClass1() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyInNonAbstractClass2.kt")
         public void testAbstractPropertyInNonAbstractClass2() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInNonAbstractClass2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyInPrimaryConstructorParameters.kt")
         public void testAbstractPropertyInPrimaryConstructorParameters() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyInPrimaryConstructorParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyInPrimaryConstructorParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyNotInClass.kt")
         public void testAbstractPropertyNotInClass() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyNotInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyNotInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWIthInitializer2.kt")
         public void testAbstractPropertyWIthInitializer2() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWIthInitializer3.kt")
         public void testAbstractPropertyWIthInitializer3() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWIthInitializer3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWithGetter1.kt")
         public void testAbstractPropertyWithGetter1() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWithGetter2.kt")
         public void testAbstractPropertyWithGetter2() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithGetter2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWithInitializer1.kt")
         public void testAbstractPropertyWithInitializer1() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWithInitializer1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithInitializer1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAbstractPropertyWithSetter.kt")
         public void testAbstractPropertyWithSetter() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeAbstractPropertyWithSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeAbstractPropertyWithSetter.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInAbstract() throws Exception {
@@ -112,37 +129,44 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeMustBeInitializedOrBeAbstract.kt")
         public void testMustBeInitializedOrBeAbstract() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeMustBeInitializedOrBeAbstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeMustBeInitializedOrBeAbstract.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNonAbstractFunctionWithNoBody.kt")
         public void testNonAbstractFunctionWithNoBody() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeNonAbstractFunctionWithNoBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonAbstractFunctionWithNoBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNonMemberAbstractFunction.kt")
         public void testNonMemberAbstractFunction() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeNonMemberAbstractFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonMemberAbstractFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNonMemberFunctionNoBody.kt")
         public void testNonMemberFunctionNoBody() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRedundantAbstract.kt")
         public void testRedundantAbstract() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeRedundantAbstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeRedundantAbstract.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeReplaceOpen.kt")
         public void testReplaceOpen() throws Exception {
-            doTest("idea/testData/quickfix/abstract/beforeReplaceOpen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/abstract/beforeReplaceOpen.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/addStarProjections")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({AddStarProjections.Cast.class, AddStarProjections.CheckType.class, AddStarProjections.JavaClass.class, AddStarProjections.When.class})
     public static class AddStarProjections extends AbstractQuickFixTest {
         public void testAllFilesPresentInAddStarProjections() throws Exception {
@@ -151,35 +175,42 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeQualifiedArrayList.kt")
         public void testQualifiedArrayList() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeQualifiedArrayList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedArrayList.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeQualifiedList.kt")
         public void testQualifiedList() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeQualifiedList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedList.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeQualifiedMap.kt")
         public void testQualifiedMap() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeQualifiedMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeQualifiedMap.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnqualifiedList.kt")
         public void testUnqualifiedList() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeUnqualifiedList.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedList.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnqualifiedMap.kt")
         public void testUnqualifiedMap() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMap.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMap.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnqualifiedMapOneArg.kt")
         public void testUnqualifiedMapOneArg() throws Exception {
-            doTest("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/cast")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Cast extends AbstractQuickFixTest {
             public void testAllFilesPresentInCast() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -187,17 +218,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeChangeToStarProjection.kt")
             public void testChangeToStarProjection() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjection.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjection.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeToStarProjectionNullable.kt")
             public void testChangeToStarProjectionNullable() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjectionNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/beforeChangeToStarProjectionNullable.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/checkType")
+        @TestDataPath("$PROJECT_ROOT")
         public static class CheckType extends AbstractQuickFixTest {
             public void testAllFilesPresentInCheckType() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -205,22 +239,26 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeChangeToStarProjectionMultipleParameters.kt")
             public void testChangeToStarProjectionMultipleParameters() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionMultipleParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionMultipleParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeToStarProjectionNullable.kt")
             public void testChangeToStarProjectionNullable() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeToStarProjectionSingleParameter.kt")
             public void testChangeToStarProjectionSingleParameter() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionSingleParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/checkType/beforeChangeToStarProjectionSingleParameter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/javaClass")
+        @TestDataPath("$PROJECT_ROOT")
         public static class JavaClass extends AbstractQuickFixTest {
             public void testAllFilesPresentInJavaClass() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -228,27 +266,32 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeFooOfC2.kt")
             public void testFooOfC2() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeJavaClassOfC1Runtime.kt")
             public void testJavaClassOfC1Runtime() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC1Runtime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC1Runtime.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeJavaClassOfC2Runtime.kt")
             public void testJavaClassOfC2Runtime() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC2Runtime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfC2Runtime.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeJavaClassOfCRuntime.kt")
             public void testJavaClassOfCRuntime() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/addStarProjections/when")
+        @TestDataPath("$PROJECT_ROOT")
         public static class When extends AbstractQuickFixTest {
             public void testAllFilesPresentInWhen() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -256,32 +299,38 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeQualifiedArrayList.kt")
             public void testQualifiedArrayList() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeQualifiedArrayList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedArrayList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeQualifiedList.kt")
             public void testQualifiedList() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeQualifiedList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeQualifiedMap.kt")
             public void testQualifiedMap() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeQualifiedMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeQualifiedMap.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeUnqualifiedList.kt")
             public void testUnqualifiedList() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedList.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedList.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeUnqualifiedMap.kt")
             public void testUnqualifiedMap() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMap.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMap.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeUnqualifiedMapOneArg.kt")
             public void testUnqualifiedMapOneArg() throws Exception {
-                doTest("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt");
+                doTest(fileName);
             }
             
         }
@@ -298,6 +347,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/autoImports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AutoImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInAutoImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -305,91 +355,109 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt")
         public void testCheckNoStackOverflowInImportInnerClassInCurrentFile() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeCheckNoStackOverflowInImportInnerClassInCurrentFile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeLibraryPropertyRuntime.kt")
         public void testLibraryPropertyRuntime() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeLibraryPropertyRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryPropertyRuntime.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeLibraryTopLevelFunctionImportRuntime.kt")
         public void testLibraryTopLevelFunctionImportRuntime() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportRuntime.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeLibraryTopLevelFunctionImportRuntime.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNamelessClass.kt")
         public void testNamelessClass() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNamelessClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNamelessFunction.kt")
         public void testNamelessFunction() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNamelessFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNamelessObject.kt")
         public void testNamelessObject() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNamelessObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNamelessParameter.kt")
         public void testNamelessParameter() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNamelessParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNamelessProperty.kt")
         public void testNamelessProperty() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNamelessProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNamelessProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoImportForAlreadyImported.kt")
         public void testNoImportForAlreadyImported() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNoImportForAlreadyImported.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoImportForIndex.kt")
         public void testNoImportForIndex() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeNoImportForIndex.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnresolvedReferenceInCall.kt")
         public void testUnresolvedReferenceInCall() throws Exception {
-            doTest("idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/beforeUnresolvedReferenceInCall.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/changeSignature")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ChangeSignature extends AbstractQuickFixTest {
         @TestMetadata("beforeAddConstructorParameter.kt")
         public void testAddConstructorParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddConstructorParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAddFunctionParameter.kt")
         public void testAddFunctionParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddFunctionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddFunctionParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAddFunctionParameterAndChangeTypes.kt")
         public void testAddFunctionParameterAndChangeTypes() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddFunctionParameterAndChangeTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddFunctionParameterAndChangeTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAddParameterNotAvailableForBuiltins.kt")
         public void testAddParameterNotAvailableForBuiltins() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAddParameterNotAvailableForLibrary.kt")
         public void testAddParameterNotAvailableForLibrary() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAddParameterToFakeOverride.kt")
         public void testAddParameterToFakeOverride() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeAddParameterToFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeAddParameterToFakeOverride.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInChangeSignature() throws Exception {
@@ -398,82 +466,98 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeChangeFunctionLiteralParameters1.kt")
         public void testChangeFunctionLiteralParameters1() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeChangeFunctionLiteralParameters2.kt")
         public void testChangeFunctionLiteralParameters2() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeChangeFunctionLiteralParameters2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeComplexHierarchy.kt")
         public void testComplexHierarchy() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeComplexHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeComplexHierarchyHead.kt")
         public void testComplexHierarchyHead() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeComplexHierarchyHead.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchyHead.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeComplexHierarchyTail.kt")
         public void testComplexHierarchyTail() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeComplexHierarchyTail.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeComplexHierarchyTail.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeLinearHierarchy.kt")
         public void testLinearHierarchy() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeLinearHierarchy.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeLinearHierarchy.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNotAvailableForSynthesized.kt")
         public void testNotAvailableForSynthesized() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveConstructorParameter.kt")
         public void testRemoveConstructorParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveConstructorParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveFunctionFirstParameter.kt")
         public void testRemoveFunctionFirstParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveFunctionFirstParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionFirstParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveFunctionSecondParameter1.kt")
         public void testRemoveFunctionSecondParameter1() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveFunctionSecondParameter2.kt")
         public void testRemoveFunctionSecondParameter2() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveFunctionSecondParameter2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveNamedParameter.kt")
         public void testRemoveNamedParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveNamedParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveNamedParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveParameterFromFakeOverride.kt")
         public void testRemoveParameterFromFakeOverride() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveParameterFromFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveParameterFromFakeOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveParameterNotAvailableForBuiltins.kt")
         public void testRemoveParameterNotAvailableForBuiltins() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveUnusedParameter.kt")
         public void testRemoveUnusedParameter() throws Exception {
-            doTest("idea/testData/quickfix/changeSignature/beforeRemoveUnusedParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/beforeRemoveUnusedParameter.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/checkArguments")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CheckArguments extends AbstractQuickFixTest {
         public void testAllFilesPresentInCheckArguments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -481,47 +565,56 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeInvokeOnString.kt")
         public void testInvokeOnString() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeInvokeOnString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeInvokeOnString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArguments.kt")
         public void testMixedNamedAndPositionalArguments() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArgumentsConstructor.kt")
         public void testMixedNamedAndPositionalArgumentsConstructor() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArgumentsMultiple.kt")
         public void testMixedNamedAndPositionalArgumentsMultiple() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsMultiple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArgumentsSubtype.kt")
         public void testMixedNamedAndPositionalArgumentsSubtype() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsSubtype.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArgumentsUsedNamed.kt")
         public void testMixedNamedAndPositionalArgumentsUsedNamed() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedNamed.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMixedNamedAndPositionalArgumentsUsedPositional.kt")
         public void testMixedNamedAndPositionalArgumentsUsedPositional() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeMixedNamedAndPositionalArgumentsUsedPositional.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNonVarargSpread.kt")
         public void testNonVarargSpread() throws Exception {
-            doTest("idea/testData/quickfix/checkArguments/beforeNonVarargSpread.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/checkArguments/beforeNonVarargSpread.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/createFromUsage")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({CreateFromUsage.Component.class, CreateFromUsage.Get.class, CreateFromUsage.HasNext.class, CreateFromUsage.Iterator.class, CreateFromUsage.Next.class, CreateFromUsage.Set.class})
     public static class CreateFromUsage extends AbstractQuickFixTest {
         public void testAllFilesPresentInCreateFromUsage() throws Exception {
@@ -529,6 +622,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/component")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Component extends AbstractQuickFixTest {
             public void testAllFilesPresentInComponent() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/component"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -536,22 +630,26 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateComponentFromUsage1.kt")
             public void testCreateComponentFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateComponentFromUsage2.kt")
             public void testCreateComponentFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateComponentFromUsage3.kt")
             public void testCreateComponentFromUsage3() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/component/beforeCreateComponentFromUsage3.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/get")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Get extends AbstractQuickFixTest {
             public void testAllFilesPresentInGet() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/get"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -559,67 +657,80 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateGetFromUsage1.kt")
             public void testCreateGetFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage10.kt")
             public void testCreateGetFromUsage10() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage10.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage11.kt")
             public void testCreateGetFromUsage11() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage11.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage12.kt")
             public void testCreateGetFromUsage12() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage12.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage13.kt")
             public void testCreateGetFromUsage13() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage13.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage2.kt")
             public void testCreateGetFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage3.kt")
             public void testCreateGetFromUsage3() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage4.kt")
             public void testCreateGetFromUsage4() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage4.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage5.kt")
             public void testCreateGetFromUsage5() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage5.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage7.kt")
             public void testCreateGetFromUsage7() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage7.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage8.kt")
             public void testCreateGetFromUsage8() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage8.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateGetFromUsage9.kt")
             public void testCreateGetFromUsage9() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/get/beforeCreateGetFromUsage9.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/hasNext")
+        @TestDataPath("$PROJECT_ROOT")
         public static class HasNext extends AbstractQuickFixTest {
             public void testAllFilesPresentInHasNext() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/hasNext"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -627,17 +738,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateHasNextFromUsage1.kt")
             public void testCreateHasNextFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateHasNextFromUsage2.kt")
             public void testCreateHasNextFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/hasNext/beforeCreateHasNextFromUsage2.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/iterator")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Iterator extends AbstractQuickFixTest {
             public void testAllFilesPresentInIterator() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/iterator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -645,22 +759,26 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateIteratorFromUsage1.kt")
             public void testCreateIteratorFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateIteratorFromUsage2.kt")
             public void testCreateIteratorFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateIteratorFromUsage3.kt")
             public void testCreateIteratorFromUsage3() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/iterator/beforeCreateIteratorFromUsage3.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/next")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Next extends AbstractQuickFixTest {
             public void testAllFilesPresentInNext() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/next"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -668,17 +786,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateNextFromUsage1.kt")
             public void testCreateNextFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateNextFromUsage2.kt")
             public void testCreateNextFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/next/beforeCreateNextFromUsage2.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/createFromUsage/set")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Set extends AbstractQuickFixTest {
             public void testAllFilesPresentInSet() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/set"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -686,12 +807,14 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCreateSetFromUsage1.kt")
             public void testCreateSetFromUsage1() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCreateSetFromUsage2.kt")
             public void testCreateSetFromUsage2() throws Exception {
-                doTest("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/set/beforeCreateSetFromUsage2.kt");
+                doTest(fileName);
             }
             
         }
@@ -710,6 +833,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Expressions extends AbstractQuickFixTest {
         public void testAllFilesPresentInExpressions() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -717,66 +841,79 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeDanglingFunctionLiteralArgument.kt")
         public void testDanglingFunctionLiteralArgument() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeDanglingFunctionLiteralArgument.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeDanglingFunctionLiteralArgument.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnnecessaryNonNullAssertion1.kt")
         public void testUnnecessaryNonNullAssertion1() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnnecessaryNonNullAssertion2.kt")
         public void testUnnecessaryNonNullAssertion2() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnnecessaryNonNullAssertion3.kt")
         public void testUnnecessaryNonNullAssertion3() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessaryNonNullAssertion3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnnecessarySafeCall1.kt")
         public void testUnnecessarySafeCall1() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnnecessarySafeCall1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnsafeCall1.kt")
         public void testUnsafeCall1() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnsafeCall1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnsafeCall2.kt")
         public void testUnsafeCall2() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnsafeCall2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnsafeCall3.kt")
         public void testUnsafeCall3() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUnsafeCall3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUnsafeCall3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUselessCast.kt")
         public void testUselessCast() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUselessCast.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUselessCast.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUselessCastStaticAssertIsFine.kt")
         public void testUselessCastStaticAssertIsFine() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUselessCastStaticAssertIsFine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUselessCastStaticAssertIsFine.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUselessElvis.kt")
         public void testUselessElvis() throws Exception {
-            doTest("idea/testData/quickfix/expressions/beforeUselessElvis.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/expressions/beforeUselessElvis.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/migration")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Migration extends AbstractQuickFixTest {
         @TestMetadata("beforeAddOverrideToEqualsHashCodeToString.kt")
         public void testAddOverrideToEqualsHashCodeToString() throws Exception {
-            doTest("idea/testData/quickfix/migration/beforeAddOverrideToEqualsHashCodeToString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/beforeAddOverrideToEqualsHashCodeToString.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInMigration() throws Exception {
@@ -785,17 +922,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeValVarFromParameters.kt")
         public void testValVarFromParameters() throws Exception {
-            doTest("idea/testData/quickfix/migration/beforeValVarFromParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/migration/beforeValVarFromParameters.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/modifiers")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class})
     public static class Modifiers extends AbstractQuickFixTest {
         @TestMetadata("beforeAddInnerModifier.kt")
         public void testAddInnerModifier() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeAddInnerModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeAddInnerModifier.kt");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInModifiers() throws Exception {
@@ -804,110 +944,132 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeCannotMakeClassAnnotation.kt")
         public void testCannotMakeClassAnnotation() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeFinalTrait.kt")
         public void testFinalTrait() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeFinalTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeFinalTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeIllegalEnumAnnotation1.kt")
         public void testIllegalEnumAnnotation1() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeIllegalEnumAnnotation2.kt")
         public void testIllegalEnumAnnotation2() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeIllegalEnumAnnotation2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNestedClassNotAllowed.kt")
         public void testNestedClassNotAllowed() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeNestedClassNotAllowed.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeNestedClassNotAllowed.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNotAnAnnotationClass.kt")
         public void testNotAnAnnotationClass() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeNotAnAnnotationClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeNotAnAnnotationClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOpenMemberInFinalClass1.kt")
         public void testOpenMemberInFinalClass1() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOpenMemberInFinalClass2.kt")
         public void testOpenMemberInFinalClass2() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenMemberInFinalClass2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOpenModifierInEnum.kt")
         public void testOpenModifierInEnum() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeOpenModifierInEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePackageMemberCannotBeProtected.kt")
         public void testPackageMemberCannotBeProtected() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforePackageMemberCannotBeProtected.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveIncompatibleModifier.kt")
         public void testRemoveIncompatibleModifier() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveIncompatibleModifier.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveRedundantModifier1.kt")
         public void testRemoveRedundantModifier1() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveRedundantModifier2.kt")
         public void testRemoveRedundantModifier2() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveRedundantModifier3.kt")
         public void testRemoveRedundantModifier3() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveRedundantModifier3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertype1.kt")
         public void testRemoveSupertype1() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveSupertype1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertype2.kt")
         public void testRemoveSupertype2() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveSupertype2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertype3.kt")
         public void testRemoveSupertype3() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveSupertype3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertype4.kt")
         public void testRemoveSupertype4() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeRemoveSupertype4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeRemoveSupertype4.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeVisibilityModifer1.kt")
         public void testVisibilityModifer1() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeVisibilityModifer1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModifer1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeVisibilityModifer2.kt")
         public void testVisibilityModifer2() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeVisibilityModifer2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModifer2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeVisibilityModiferParameter.kt")
         public void testVisibilityModiferParameter() throws Exception {
-            doTest("idea/testData/quickfix/modifiers/beforeVisibilityModiferParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/beforeVisibilityModiferParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class})
         public static class AddOpenToClassDeclaration extends AbstractQuickFixTest {
             public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception {
@@ -916,50 +1078,60 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeEnumSupertype.kt")
             public void testEnumSupertype() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeEnumUpperBound.kt")
             public void testEnumUpperBound() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeExplicitlyFinalSupertype.kt")
             public void testExplicitlyFinalSupertype() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeExplicitlyFinalUpperBound.kt")
             public void testExplicitlyFinalUpperBound() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeExplicitlyFinalUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFinalLibrarySupertype.kt")
             public void testFinalLibrarySupertype() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFinalLibraryUpperBound.kt")
             public void testFinalLibraryUpperBound() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFinalSupertype.kt")
             public void testFinalSupertype() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFinalUpperBound.kt")
             public void testFinalUpperBound() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalUpperBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalUpperBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeImplementTraitFinalSupertype.kt")
             public void testImplementTraitFinalSupertype() throws Exception {
-                doTest("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeImplementTraitFinalSupertype.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeImplementTraitFinalSupertype.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({FinalJavaClass.JavaCode.class})
             public static class FinalJavaClass extends AbstractQuickFixTest {
                 public void testAllFilesPresentInFinalJavaClass() throws Exception {
@@ -967,6 +1139,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 }
                 
                 @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode")
+                @TestDataPath("$PROJECT_ROOT")
                 @InnerTestClasses({})
                 public static class JavaCode extends AbstractQuickFixTest {
                     public void testAllFilesPresentInJavaCode() throws Exception {
@@ -1005,6 +1178,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/nullables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Nullables.UnsafeInfixCall.class})
     public static class Nullables extends AbstractQuickFixTest {
         public void testAllFilesPresentInNullables() throws Exception {
@@ -1013,25 +1187,30 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeRemoveRedundantNullable.kt")
         public void testRemoveRedundantNullable() throws Exception {
-            doTest("idea/testData/quickfix/nullables/beforeRemoveRedundantNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveRedundantNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertypeNullable1.kt")
         public void testRemoveSupertypeNullable1() throws Exception {
-            doTest("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveSupertypeNullable2.kt")
         public void testRemoveSupertypeNullable2() throws Exception {
-            doTest("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveSupertypeNullable2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveUselessNullable.kt")
         public void testRemoveUselessNullable() throws Exception {
-            doTest("idea/testData/quickfix/nullables/beforeRemoveUselessNullable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/beforeRemoveUselessNullable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/nullables/unsafeInfixCall")
+        @TestDataPath("$PROJECT_ROOT")
         public static class UnsafeInfixCall extends AbstractQuickFixTest {
             public void testAllFilesPresentInUnsafeInfixCall() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1039,7 +1218,8 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeUnsafeInfixCall.kt")
             public void testUnsafeInfixCall() throws Exception {
-                doTest("idea/testData/quickfix/nullables/unsafeInfixCall/beforeUnsafeInfixCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/nullables/unsafeInfixCall/beforeUnsafeInfixCall.kt");
+                doTest(fileName);
             }
             
         }
@@ -1053,6 +1233,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/override")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Override.NothingToOverride.class, Override.TypeMismatchOnOverride.class})
     public static class Override extends AbstractQuickFixTest {
         public void testAllFilesPresentInOverride() throws Exception {
@@ -1061,139 +1242,167 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeChangeToInvocation.kt")
         public void testChangeToInvocation() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeChangeToInvocation.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeChangeToInvocation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverriddingMultipleFinalMethods.kt")
         public void testOverriddingMultipleFinalMethods() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverriddingMultipleFinalMethods.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverriddingMultipleFinalMethods.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingDelegatedMethod.kt")
         public void testOverridingDelegatedMethod() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingDelegatedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingDelegatedMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingFakeOverride.kt")
         public void testOverridingFakeOverride() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingFakeOverride.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFakeOverride.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingFinalJavaMethod.kt")
         public void testOverridingFinalJavaMethod() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingFinalMethod.kt")
         public void testOverridingFinalMethod() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingFinalMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingFinalMethodInLocal.kt")
         public void testOverridingFinalMethodInLocal() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingFinalMethodInLocal.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalMethodInLocal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingFinalProperty.kt")
         public void testOverridingFinalProperty() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingFinalProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingFinalProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeOverridingWritableAndNotWritableFinalMembers.kt")
         public void testOverridingWritableAndNotWritableFinalMembers() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeParameterNameChangedAmbiguousRename.kt")
         public void testParameterNameChangedAmbiguousRename() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeParameterNameChangedMultipleOverrideRenamePossible.kt")
         public void testParameterNameChangedMultipleOverrideRenamePossible() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeParameterNameChangedMultipleOverrideRenamePossible.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedMultipleOverrideRenamePossible.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeParameterNameChangedRenamePossible.kt")
         public void testParameterNameChangedRenamePossible() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeParameterNameChangedRenamePossible.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeParameterNameChangedRenamePossible.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeVirtualMethodHidden.kt")
         public void testVirtualMethodHidden() throws Exception {
-            doTest("idea/testData/quickfix/override/beforeVirtualMethodHidden.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/beforeVirtualMethodHidden.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/override/nothingToOverride")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NothingToOverride extends AbstractQuickFixTest {
             @TestMetadata("beforeAddFunction.kt")
             public void testAddFunction() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionAbstractClass.kt")
             public void testAddFunctionAbstractClass() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionAbstractClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionInLocalDeclaration.kt")
             public void testAddFunctionInLocalDeclaration() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionInLocalDeclaration.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionInLocalDeclaration.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionNoBody.kt")
             public void testAddFunctionNoBody() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNoBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionNonUnitReturnType.kt")
             public void testAddFunctionNonUnitReturnType() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionNonUnitReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionTrait.kt")
             public void testAddFunctionTrait() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionTwoSuperclasses.kt")
             public void testAddFunctionTwoSuperclasses() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoSuperclasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddFunctionTwoTraits.kt")
             public void testAddFunctionTwoTraits() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddFunctionTwoTraits.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameter.kt")
             public void testAddParameter() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameterGenericClass.kt")
             public void testAddParameterGenericClass() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterGenericClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameterMultiple.kt")
             public void testAddParameterMultiple() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterMultiple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameterPreserveVisibility.kt")
             public void testAddParameterPreserveVisibility() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterPreserveVisibility.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameterTwoSupertraits.kt")
             public void testAddParameterTwoSupertraits() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertraits.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAddParameterTwoSupertypes.kt")
             public void testAddParameterTwoSupertypes() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeAddParameterTwoSupertypes.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInNothingToOverride() throws Exception {
@@ -1202,82 +1411,98 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeChangeParameterType.kt")
             public void testChangeParameterType() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeAbstractSuperclass.kt")
             public void testChangeParameterTypeAbstractSuperclass() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeAbstractSuperclass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeInTrait.kt")
             public void testChangeParameterTypeInTrait() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeInTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeMatchNames.kt")
             public void testChangeParameterTypeMatchNames() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeMatchNames.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeModifyOrder.kt")
             public void testChangeParameterTypeModifyOrder() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeModifyOrder.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeOpenOverride.kt")
             public void testChangeParameterTypeOpenOverride() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeOpenOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeSingleExpressionFunction.kt")
             public void testChangeParameterTypeSingleExpressionFunction() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSingleExpressionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeParameterTypeSuperTrait.kt")
             public void testChangeParameterTypeSuperTrait() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeParameterTypeSuperTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeReturnType.kt")
             public void testChangeReturnType() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeChangeReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeNoOpenSuperFunction.kt")
             public void testNoOpenSuperFunction() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeOverrideJavaMethod.kt")
             public void testOverrideJavaMethod() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeOverrideJavaMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeRemoveOverride.kt")
             public void testRemoveOverride() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeRemoveOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeRemoveParameter.kt")
             public void testRemoveParameter() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeRemoveParameterTwoTraits.kt")
             public void testRemoveParameterTwoTraits() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeRemoveParameterTwoTraits.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeSwapParametersGenericClass.kt")
             public void testSwapParametersGenericClass() throws Exception {
-                doTest("idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/nothingToOverride/beforeSwapParametersGenericClass.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/override/typeMismatchOnOverride")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TypeMismatchOnOverride extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnOverride() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1285,87 +1510,104 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCantChangeMultipleOverriddenPropertiesTypes.kt")
             public void testCantChangeMultipleOverriddenPropertiesTypes() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeMultipleOverriddenPropertiesTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt")
             public void testCantChangeOverriddenPropertyTypeToMatchOverridingProperty() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCantChangePropertyTypeToMatchOverridenProperties.kt")
             public void testCantChangePropertyTypeToMatchOverridenProperties() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCantChangeReturnTypeOfOverriddenFunction.kt")
             public void testCantChangeReturnTypeOfOverriddenFunction() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeOverriddenPropertyType1.kt")
             public void testChangeOverriddenPropertyType1() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeOverriddenPropertyType2.kt")
             public void testChangeOverriddenPropertyType2() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverriddenPropertyType2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeOverridingPropertyTypeToFunctionType.kt")
             public void testChangeOverridingPropertyTypeToFunctionType() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeOverridingPropertyTypeToFunctionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeReturnTypeOfOverriddenFunction.kt")
             public void testChangeReturnTypeOfOverriddenFunction() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeChangeReturnTypeOfOverriddenFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeObjectInsideBody.kt")
             public void testObjectInsideBody() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeObjectInsideBody.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePropertyReturnTypeMismatchOnOverride.kt")
             public void testPropertyReturnTypeMismatchOnOverride() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyReturnTypeMismatchOnOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePropertyTypeMismatchOnOverrideIntLong.kt")
             public void testPropertyTypeMismatchOnOverrideIntLong() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntLong.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePropertyTypeMismatchOnOverrideIntUnit.kt")
             public void testPropertyTypeMismatchOnOverrideIntUnit() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforePropertyTypeMismatchOnOverrideIntUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnTypeMismatchOnMultipleOverride.kt")
             public void testReturnTypeMismatchOnMultipleOverride() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt")
             public void testReturnTypeMismatchOnMultipleOverrideAmbiguity() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnMultipleOverrideAmbiguity.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnTypeMismatchOnOverrideIntLong.kt")
             public void testReturnTypeMismatchOnOverrideIntLong() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntLong.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnTypeMismatchOnOverrideIntUnit.kt")
             public void testReturnTypeMismatchOnOverrideIntUnit() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideIntUnit.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnTypeMismatchOnOverrideUnitInt.kt")
             public void testReturnTypeMismatchOnOverrideUnitInt() throws Exception {
-                doTest("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/override/typeMismatchOnOverride/beforeReturnTypeMismatchOnOverrideUnitInt.kt");
+                doTest(fileName);
             }
             
         }
@@ -1380,6 +1622,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/platformClasses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PlatformClasses extends AbstractQuickFixTest {
         public void testAllFilesPresentInPlatformClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1387,27 +1630,32 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeMapPlatformClassToKotlin1.kt")
         public void testMapPlatformClassToKotlin1() throws Exception {
-            doTest("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMapPlatformClassToKotlin2.kt")
         public void testMapPlatformClassToKotlin2() throws Exception {
-            doTest("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMapPlatformClassToKotlin3.kt")
         public void testMapPlatformClassToKotlin3() throws Exception {
-            doTest("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeMapPlatformClassToKotlin4.kt")
         public void testMapPlatformClassToKotlin4() throws Exception {
-            doTest("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/platformClasses/beforeMapPlatformClassToKotlin4.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/supercalls")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Supercalls extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupercalls() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1415,12 +1663,14 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeTypeArgumentsRedundantInSuperQualifier.kt")
         public void testTypeArgumentsRedundantInSuperQualifier() throws Exception {
-            doTest("idea/testData/quickfix/supercalls/beforeTypeArgumentsRedundantInSuperQualifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supercalls/beforeTypeArgumentsRedundantInSuperQualifier.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/supertypeInitialization")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SupertypeInitialization extends AbstractQuickFixTest {
         public void testAllFilesPresentInSupertypeInitialization() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1428,32 +1678,38 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeSupertypeNotInitialized.kt")
         public void testSupertypeNotInitialized() throws Exception {
-            doTest("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeSupertypeNotInitializedDefaultParameters.kt")
         public void testSupertypeNotInitializedDefaultParameters() throws Exception {
-            doTest("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedDefaultParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedDefaultParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeSupertypeNotInitializedEmptyConstructor.kt")
         public void testSupertypeNotInitializedEmptyConstructor() throws Exception {
-            doTest("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedEmptyConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedEmptyConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeSupertypeNotInitializedForLocalClass.kt")
         public void testSupertypeNotInitializedForLocalClass() throws Exception {
-            doTest("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForLocalClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForLocalClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeSupertypeNotInitializedForObjectExpression.kt")
         public void testSupertypeNotInitializedForObjectExpression() throws Exception {
-            doTest("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForObjectExpression.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitializedForObjectExpression.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/suppress")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Suppress.AnnotationPosition.class, Suppress.Availability.class, Suppress.DeclarationKinds.class, Suppress.ErrorRecovery.class, Suppress.ForStatement.class})
     public static class Suppress extends AbstractQuickFixTest {
         public void testAllFilesPresentInSuppress() throws Exception {
@@ -1461,6 +1717,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/annotationPosition")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AnnotationPosition extends AbstractQuickFixTest {
             public void testAllFilesPresentInAnnotationPosition() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1468,67 +1725,80 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeParamWithModifier.kt")
             public void testParamWithModifier() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeParamWithModifier.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeParamWithModifier.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionModifierOnThePreviousLine.kt")
             public void testTopLevelFunctionModifierOnThePreviousLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnThePreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnThePreviousLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionModifierOnTheSameLine.kt")
             public void testTopLevelFunctionModifierOnTheSameLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnTheSameLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionModifierOnTheSameLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionNoModifiers.kt")
             public void testTopLevelFunctionNoModifiers() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionNoModifiers.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionNoModifiers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressAnotherPreviousLine.kt")
             public void testTopLevelFunctionSuppressAnotherPreviousLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressAnotherPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressAnotherPreviousLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt")
             public void testTopLevelFunctionSuppressEmptyArgsPreviousLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressEmptyArgsPreviousLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt")
             public void testTopLevelFunctionSuppressNoArgsPreviousLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt")
             public void testTopLevelFunctionSuppressNoArgsPreviousLineBare() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsPreviousLineBare.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt")
             public void testTopLevelFunctionSuppressNoArgsTheSameLine() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLine.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt")
             public void testTopLevelFunctionSuppressNoArgsTheSameLineBare() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionSuppressNoArgsTheSameLineBare.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionUnrelatedAnnotation.kt")
             public void testTopLevelFunctionUnrelatedAnnotation() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionUnrelatedAnnotationBare.kt")
             public void testTopLevelFunctionUnrelatedAnnotationBare() throws Exception {
-                doTest("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotationBare.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/annotationPosition/beforeTopLevelFunctionUnrelatedAnnotationBare.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/availability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Availability extends AbstractQuickFixTest {
             public void testAllFilesPresentInAvailability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1536,57 +1806,68 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeLocalFunSuppressForLocal.kt")
             public void testLocalFunSuppressForLocal() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForLocal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeLocalFunSuppressForOuter.kt")
             public void testLocalFunSuppressForOuter() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForOuter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalFunSuppressForOuter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeLocalValSuppressForFun.kt")
             public void testLocalValSuppressForFun() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeLocalValSuppressForVal.kt")
             public void testLocalValSuppressForVal() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeLocalValSuppressForVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMemberOfNestedSuppressForMember.kt")
             public void testMemberOfNestedSuppressForMember() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMemberOfNestedSuppressForNested.kt")
             public void testMemberOfNestedSuppressForNested() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForNested.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForNested.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMemberOfNestedSuppressForOuter.kt")
             public void testMemberOfNestedSuppressForOuter() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForOuter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberOfNestedSuppressForOuter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMemberSuppressForClass.kt")
             public void testMemberSuppressForClass() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMemberSuppressForMember.kt")
             public void testMemberSuppressForMember() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeMemberSuppressForMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTopLevelFunctionAlreadySuppressed.kt")
             public void testTopLevelFunctionAlreadySuppressed() throws Exception {
-                doTest("idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/availability/beforeTopLevelFunctionAlreadySuppressed.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/declarationKinds")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DeclarationKinds extends AbstractQuickFixTest {
             public void testAllFilesPresentInDeclarationKinds() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1594,62 +1875,74 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeClass.kt")
             public void testClass() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeClassObject.kt")
             public void testClassObject() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeEnumEntry.kt")
             public void testEnumEntry() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeEnumEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeEnumEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFun.kt")
             public void testFun() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMultiVal.kt")
             public void testMultiVal() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMultiVar.kt")
             public void testMultiVar() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeMultiVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeObject.kt")
             public void testObject() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeParam.kt")
             public void testParam() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTrait.kt")
             public void testTrait() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeVal.kt")
             public void testVal() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeVar.kt")
             public void testVar() throws Exception {
-                doTest("idea/testData/quickfix/suppress/declarationKinds/beforeVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/declarationKinds/beforeVar.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/errorRecovery")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ErrorRecovery extends AbstractQuickFixTest {
             public void testAllFilesPresentInErrorRecovery() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1657,17 +1950,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeNonStringInSuppress.kt")
             public void testNonStringInSuppress() throws Exception {
-                doTest("idea/testData/quickfix/suppress/errorRecovery/beforeNonStringInSuppress.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/beforeNonStringInSuppress.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeUnresolvedAnnotation.kt")
             public void testUnresolvedAnnotation() throws Exception {
-                doTest("idea/testData/quickfix/suppress/errorRecovery/beforeUnresolvedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/errorRecovery/beforeUnresolvedAnnotation.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/suppress/forStatement")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ForStatement.Unavailable.class})
         public static class ForStatement extends AbstractQuickFixTest {
             public void testAllFilesPresentInForStatement() throws Exception {
@@ -1676,200 +1972,240 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeAndAnd.kt")
             public void testAndAnd() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAndAnd.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAndAnd.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAnnotatedExpr.kt")
             public void testAnnotatedExpr() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExpr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExpr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAnnotatedExprWithSuppress.kt")
             public void testAnnotatedExprWithSuppress() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExprWithSuppress.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAnnotatedExprWithSuppress.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeArrayRead.kt")
             public void testArrayRead() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeArrayRead.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeArrayRead.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAs.kt")
             public void testAs() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAsSafe.kt")
             public void testAsSafe() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAsSafe.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAsSafe.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAssign.kt")
             public void testAssign() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeAssign.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeAssign.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCall.kt")
             public void testCall() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeCall.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeColon.kt")
             public void testColon() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeColon.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeColon.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeDoWhile.kt")
             public void testDoWhile() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeDoWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeDoWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeDotQualified.kt")
             public void testDotQualified() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeDotQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeDotQualified.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeElvis.kt")
             public void testElvis() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeElvis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeElvis.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeEqEq.kt")
             public void testEqEq() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeEqEq.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeEqEq.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeFor.kt")
             public void testFor() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeFor.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeFor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeIf.kt")
             public void testIf() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeIf.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIf.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeIn.kt")
             public void testIn() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeIn.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeInfix.kt")
             public void testInfix() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeInfix.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeInfix.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeIs.kt")
             public void testIs() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeIs.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeIs.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeLabeled.kt")
             public void testLabeled() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeLabeled.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeLess.kt")
             public void testLess() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeLess.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeLess.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMul.kt")
             public void testMul() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeMul.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeMul.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeOrOr.kt")
             public void testOrOr() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeOrOr.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeOrOr.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeParenthesized.kt")
             public void testParenthesized() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeParenthesized.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeParenthesized.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePlus.kt")
             public void testPlus() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforePlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePlus.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePostfix.kt")
             public void testPostfix() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforePostfix.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePostfix.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePostfixPlusPlus.kt")
             public void testPostfixPlusPlus() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforePostfixPlusPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePostfixPlusPlus.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePrefixPlusPlus.kt")
             public void testPrefixPlusPlus() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforePrefixPlusPlus.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforePrefixPlusPlus.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeRange.kt")
             public void testRange() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeRange.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeRange.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturn.kt")
             public void testReturn() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeReturn.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeSafeQualified.kt")
             public void testSafeQualified() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeSafeQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeSafeQualified.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeSimpleName.kt")
             public void testSimpleName() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeSimpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeSimpleName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeStringTemplate.kt")
             public void testStringTemplate() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeStringTemplate.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeStringTemplate.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeThrow.kt")
             public void testThrow() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeThrow.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeThrow.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTry.kt")
             public void testTry() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeTry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeTry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeWhenExpressionEntry.kt")
             public void testWhenExpressionEntry() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeWhenExpressionEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenExpressionEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeWhenInEntry.kt")
             public void testWhenInEntry() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeWhenInEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenInEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeWhenIsEntry.kt")
             public void testWhenIsEntry() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeWhenIsEntry.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenIsEntry.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeWhenSubject.kt")
             public void testWhenSubject() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeWhenSubject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhenSubject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeWhile.kt")
             public void testWhile() throws Exception {
-                doTest("idea/testData/quickfix/suppress/forStatement/beforeWhile.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/beforeWhile.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("idea/testData/quickfix/suppress/forStatement/unavailable")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Unavailable extends AbstractQuickFixTest {
                 public void testAllFilesPresentInUnavailable() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1877,57 +2213,68 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 
                 @TestMetadata("beforeInAnnotationArgument.kt")
                 public void testInAnnotationArgument() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInAnnotationArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInClassHeader.kt")
                 public void testInClassHeader() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInClassHeader.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInDefaultArgument.kt")
                 public void testInDefaultArgument() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInDefaultArgument.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInExpressionBody.kt")
                 public void testInExpressionBody() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInExpressionBody.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInLocalValInitializer.kt")
                 public void testInLocalValInitializer() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInLocalValInitializer.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInParameterType.kt")
                 public void testInParameterType() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterType.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInParameterTypeInFunctionLiteral.kt")
                 public void testInParameterTypeInFunctionLiteral() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInParameterTypeInFunctionLiteral.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeInPropertyInitializer.kt")
                 public void testInPropertyInitializer() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeInPropertyInitializer.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeObjectLiteral.kt")
                 public void testObjectLiteral() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteral.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeObjectLiteralInsideExpression.kt")
                 public void testObjectLiteralInsideExpression() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeObjectLiteralInsideExpression.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("beforeSupretype.kt")
                 public void testSupretype() throws Exception {
-                    doTest("idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/suppress/forStatement/unavailable/beforeSupretype.kt");
+                    doTest(fileName);
                 }
                 
             }
@@ -1953,6 +2300,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/typeAddition")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeAddition extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeAddition() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -1960,67 +2308,80 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeAmbiguousFunctionReturnType.kt")
         public void testAmbiguousFunctionReturnType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeAmbiguousFunctionReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeAmbiguousFunctionReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeAmbiguousPropertyReturnType.kt")
         public void testAmbiguousPropertyReturnType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeAmbiguousPropertyReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeAmbiguousPropertyReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeChangeAccessorTypeToFunctionType.kt")
         public void testChangeAccessorTypeToFunctionType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeChangeAccessorTypeToFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoAddErrorType.kt")
         public void testNoAddErrorType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeNoAddErrorType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeProtectedFunWithoutReturnType.kt")
         public void testProtectedFunWithoutReturnType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePublicFunWithoutBody.kt")
         public void testPublicFunWithoutBody() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePublicFunWithoutReturnType.kt")
         public void testPublicFunWithoutReturnType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePublicFunWithoutReturnTypeCaretOnParameter.kt")
         public void testPublicFunWithoutReturnTypeCaretOnParameter() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnTypeCaretOnParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnTypeCaretOnParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePublicValWithoutReturnType.kt")
         public void testPublicValWithoutReturnType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePublicValWithoutReturnTypeCaretOnPublic.kt")
         public void testPublicValWithoutReturnTypeCaretOnPublic() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnTypeCaretOnPublic.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnTypeCaretOnPublic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeWrongGetterParameterType.kt")
         public void testWrongGetterParameterType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeWrongGetterParameterType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeWrongGetterParameterType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeWrongSetterParameterType.kt")
         public void testWrongSetterParameterType() throws Exception {
-            doTest("idea/testData/quickfix/typeAddition/beforeWrongSetterParameterType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeAddition/beforeWrongSetterParameterType.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/typeImports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2028,32 +2389,38 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeHasThisImport.kt")
         public void testHasThisImport() throws Exception {
-            doTest("idea/testData/quickfix/typeImports/beforeHasThisImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeHasThisImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoImportFromTheSameFile.kt")
         public void testNoImportFromTheSameFile() throws Exception {
-            doTest("idea/testData/quickfix/typeImports/beforeNoImportFromTheSameFile.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportFromTheSameFile.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoImportJavaLang.kt")
         public void testNoImportJavaLang() throws Exception {
-            doTest("idea/testData/quickfix/typeImports/beforeNoImportJavaLang.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportJavaLang.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoImportJetStandard.kt")
         public void testNoImportJetStandard() throws Exception {
-            doTest("idea/testData/quickfix/typeImports/beforeNoImportJetStandard.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeNoImportJetStandard.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeToImport1.kt")
         public void testToImport1() throws Exception {
-            doTest("idea/testData/quickfix/typeImports/beforeToImport1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeImports/beforeToImport1.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/typeMismatch")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({TypeMismatch.Casts.class, TypeMismatch.ComponentFunctionReturnTypeMismatch.class, TypeMismatch.FixOverloadedOperator.class, TypeMismatch.ParameterTypeMismatch.class, TypeMismatch.TypeMismatchOnReturnedExpression.class})
     public static class TypeMismatch extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeMismatch() throws Exception {
@@ -2062,70 +2429,84 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeChangeFunctionLiteralParameterTypeToFunctionType.kt")
         public void testChangeFunctionLiteralParameterTypeToFunctionType() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionLiteralParameterTypeToFunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt")
         public void testChangeFunctionReturnTypeToMatchExpectedTypeOfCall() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeFunctionReturnTypeToMatchExpectedTypeOfCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeChangeReturnTypeWhenFunctionNameIsMissing.kt")
         public void testChangeReturnTypeWhenFunctionNameIsMissing() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenFunctionNameIsMissing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt")
         public void testChangeReturnTypeWhenValueParameterListIsAbsent() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeChangeReturnTypeWhenValueParameterListIsAbsent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeCompareToTypeMismatch.kt")
         public void testCompareToTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeCompareToTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeCompareToTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeDontChangeOverriddenPropertyTypeToErrorType.kt")
         public void testDontChangeOverriddenPropertyTypeToErrorType() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeDontChangeOverriddenPropertyTypeToErrorType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeExpectedParameterTypeMismatch.kt")
         public void testExpectedParameterTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeExpectedParameterTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeExpectedReturnTypeMismatch.kt")
         public void testExpectedReturnTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeExpectedReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeExpectedReturnTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeHasNextFunctionReturnTypeMismatch.kt")
         public void testHasNextFunctionReturnTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeHasNextFunctionReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeHasNextFunctionReturnTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoReturnInFunctionWithBlockBody.kt")
         public void testNoReturnInFunctionWithBlockBody() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeNoReturnInFunctionWithBlockBody.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforePropertyTypeMismatch.kt")
         public void testPropertyTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforePropertyTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeReturnTypeMismatch.kt")
         public void testReturnTypeMismatch() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeReturnTypeMismatch.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeTooManyArgumentsException.kt")
         public void testTooManyArgumentsException() throws Exception {
-            doTest("idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/beforeTooManyArgumentsException.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/casts")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Casts extends AbstractQuickFixTest {
             public void testAllFilesPresentInCasts() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2133,52 +2514,62 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeAutocastImpossible1.kt")
             public void testAutocastImpossible1() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAutocastImpossible2.kt")
             public void testAutocastImpossible2() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAutocastImpossible3.kt")
             public void testAutocastImpossible3() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeAutocastImpossible3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeCastToFunctionType.kt")
             public void testCastToFunctionType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeCastToFunctionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatch1.kt")
             public void testTypeMismatch1() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatch2.kt")
             public void testTypeMismatch2() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatch3.kt")
             public void testTypeMismatch3() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatch4.kt")
             public void testTypeMismatch4() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatch5.kt")
             public void testTypeMismatch5() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch5.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ComponentFunctionReturnTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInComponentFunctionReturnTypeMismatch() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2186,32 +2577,38 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeComponentFunctionReturnTypeMismatch1.kt")
             public void testComponentFunctionReturnTypeMismatch1() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeComponentFunctionReturnTypeMismatch2.kt")
             public void testComponentFunctionReturnTypeMismatch2() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeComponentFunctionReturnTypeMismatch3.kt")
             public void testComponentFunctionReturnTypeMismatch3() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeComponentFunctionReturnTypeMismatch4.kt")
             public void testComponentFunctionReturnTypeMismatch4() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch4.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeComponentFunctionReturnTypeMismatch5.kt")
             public void testComponentFunctionReturnTypeMismatch5() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch/beforeComponentFunctionReturnTypeMismatch5.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator")
+        @TestDataPath("$PROJECT_ROOT")
         public static class FixOverloadedOperator extends AbstractQuickFixTest {
             public void testAllFilesPresentInFixOverloadedOperator() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2219,22 +2616,26 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeChangeNotFunctionReturnType.kt")
             public void testChangeNotFunctionReturnType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeNotFunctionReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangePlusFunctionReturnType.kt")
             public void testChangePlusFunctionReturnType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangePlusFunctionReturnType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeTimesFunctionParameterType.kt")
             public void testChangeTimesFunctionParameterType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator/beforeChangeTimesFunctionParameterType.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ParameterTypeMismatch extends AbstractQuickFixTest {
             public void testAllFilesPresentInParameterTypeMismatch() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2242,42 +2643,50 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeChangeFunctionParameterType1.kt")
             public void testChangeFunctionParameterType1() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType1.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionParameterType2.kt")
             public void testChangeFunctionParameterType2() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType2.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionParameterType3.kt")
             public void testChangeFunctionParameterType3() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType3.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionParameterType4.kt")
             public void testChangeFunctionParameterType4() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType4.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionParameterType5.kt")
             public void testChangeFunctionParameterType5() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangePrimaryConstructorParameterType.kt")
             public void testChangePrimaryConstructorParameterType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangePrimaryConstructorParameterType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMultiFakeOverride.kt")
             public void testMultiFakeOverride() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TypeMismatchOnReturnedExpression extends AbstractQuickFixTest {
             public void testAllFilesPresentInTypeMismatchOnReturnedExpression() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2285,82 +2694,98 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeAssignmentTypeMismatch.kt")
             public void testAssignmentTypeMismatch() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeAssignmentTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeAssignmentTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt")
             public void testChangeFunctionLiteralTypeWithoutChangingFunctionParameterType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingFunctionParameterType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt")
             public void testChangeFunctionLiteralTypeWithoutChangingPropertyType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionLiteralTypeWithoutChangingPropertyType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionReturnTypeToFunctionType.kt")
             public void testChangeFunctionReturnTypeToFunctionType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToFunctionType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToFunctionType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt")
             public void testChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeChangeFunctionReturnTypeToMatchReturnTypeOfReturnedLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeDontChangeFunctionReturnTypeToErrorType.kt")
             public void testDontChangeFunctionReturnTypeToErrorType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeDontChangeFunctionReturnTypeToErrorType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeDontChangeFunctionReturnTypeToErrorType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeExpectedTypeMismatch.kt")
             public void testExpectedTypeMismatch() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeExpectedTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeExpectedTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMultiFakeOverride.kt")
             public void testMultiFakeOverride() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeMultiFakeOverrideForOperatorConvention.kt")
             public void testMultiFakeOverrideForOperatorConvention() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverrideForOperatorConvention.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeMultiFakeOverrideForOperatorConvention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforePropertyGetterInitializerTypeMismatch.kt")
             public void testPropertyGetterInitializerTypeMismatch() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforePropertyGetterInitializerTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforePropertyGetterInitializerTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt")
             public void testReturnedExpresionCantEvaluateToExpresionThatTypeMismatch() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeReturnedExpressionTypeMismatchFunctionParameterType.kt")
             public void testReturnedExpressionTypeMismatchFunctionParameterType() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpressionTypeMismatchFunctionParameterType.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpressionTypeMismatchFunctionParameterType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatchInIfStatementReturnedByFunction.kt")
             public void testTypeMismatchInIfStatementReturnedByFunction() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatchInIfStatementReturnedByLiteral.kt")
             public void testTypeMismatchInIfStatementReturnedByLiteral() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByLiteral.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInIfStatementReturnedByLiteral.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatchInInitializer.kt")
             public void testTypeMismatchInInitializer() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInInitializer.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInInitializer.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeTypeMismatchInReturnStatement.kt")
             public void testTypeMismatchInReturnStatement() throws Exception {
-                doTest("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInReturnStatement.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeTypeMismatchInReturnStatement.kt");
+                doTest(fileName);
             }
             
         }
@@ -2378,6 +2803,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/typeProjection")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeProjection extends AbstractQuickFixTest {
         public void testAllFilesPresentInTypeProjection() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2385,42 +2811,50 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeConflictingProjection.kt")
         public void testConflictingProjection() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeConflictingProjection.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeConflictingProjection.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeProjectionInImmediateArgumentToSupertype.kt")
         public void testProjectionInImmediateArgumentToSupertype() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeProjectionInImmediateArgumentToSupertype.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionInImmediateArgumentToSupertype.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeProjectionOnNonClassTypeArgument1.kt")
         public void testProjectionOnNonClassTypeArgument1() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeProjectionOnNonClassTypeArgument2.kt")
         public void testProjectionOnNonClassTypeArgument2() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeProjectionOnNonClassTypeArgument2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveRedundantProjection1.kt")
         public void testRemoveRedundantProjection1() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveRedundantProjection2.kt")
         public void testRemoveRedundantProjection2() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveRedundantProjection2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveVariance.kt")
         public void testRemoveVariance() throws Exception {
-            doTest("idea/testData/quickfix/typeProjection/beforeRemoveVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/typeProjection/beforeRemoveVariance.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/uselessImports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class UselessImports extends AbstractQuickFixTest {
         public void testAllFilesPresentInUselessImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/uselessImports"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2428,17 +2862,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeRemoveUselessHiddenImport.kt")
         public void testRemoveUselessHiddenImport() throws Exception {
-            doTest("idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/uselessImports/beforeRemoveUselessHiddenImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeRemoveUselessImport.kt")
         public void testRemoveUselessImport() throws Exception {
-            doTest("idea/testData/quickfix/uselessImports/beforeRemoveUselessImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/uselessImports/beforeRemoveUselessImport.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/quickfix/variables")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Variables.ChangeMutability.class, Variables.ChangeToBackingField.class, Variables.ChangeToFunctionInvocation.class, Variables.ChangeToPropertyName.class})
     public static class Variables extends AbstractQuickFixTest {
         public void testAllFilesPresentInVariables() throws Exception {
@@ -2447,15 +2884,18 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeUnusedVariableWithInitializer.kt")
         public void testUnusedVariableWithInitializer() throws Exception {
-            doTest("idea/testData/quickfix/variables/beforeUnusedVariableWithInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/beforeUnusedVariableWithInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeUnusedVariableWithoutInitializer.kt")
         public void testUnusedVariableWithoutInitializer() throws Exception {
-            doTest("idea/testData/quickfix/variables/beforeUnusedVariableWithoutInitializer.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/beforeUnusedVariableWithoutInitializer.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/quickfix/variables/changeMutability")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ChangeMutability extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeMutability() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2463,32 +2903,38 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeValOverrideVar.kt")
             public void testValOverrideVar() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValOverrideVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeValReassignmentLocal.kt")
             public void testValReassignmentLocal() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentLocal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeValReassignmentOuterDecl.kt")
             public void testValReassignmentOuterDecl() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentOuterDecl.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentOuterDecl.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeValReassignmentProperty.kt")
             public void testValReassignmentProperty() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValReassignmentProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeValWithSetter.kt")
             public void testValWithSetter() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeMutability/beforeValWithSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeMutability/beforeValWithSetter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/variables/changeToBackingField")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ChangeToBackingField extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToBackingField() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2496,17 +2942,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeBFRequired.kt")
             public void testBFRequired() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeKt510.kt")
             public void testKt510() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ChangeToFunctionInvocation extends AbstractQuickFixTest {
             public void testAllFilesPresentInChangeToFunctionInvocation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2514,21 +2963,25 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeFunInvWithoutParentheses.kt")
             public void testFunInvWithoutParentheses() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToFunctionInvocation/beforeFunInvWithoutParentheses.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation/beforeFunInvWithoutParentheses.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/quickfix/variables/changeToPropertyName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ChangeToPropertyName extends AbstractQuickFixTest {
             @TestMetadata("beforeAbstractProperty.kt")
             public void testAbstractProperty() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeAbstractPropertyThis.kt")
             public void testAbstractPropertyThis() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractPropertyThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeAbstractPropertyThis.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInChangeToPropertyName() throws Exception {
@@ -2537,17 +2990,20 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
             
             @TestMetadata("beforeCustomAccessors.kt")
             public void testCustomAccessors() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToPropertyName/beforeCustomAccessors.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeCustomAccessors.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeInaccessibleBackingField.kt")
             public void testInaccessibleBackingField() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingField.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("beforeInaccessibleBackingFieldQualified.kt")
             public void testInaccessibleBackingFieldQualified() throws Exception {
-                doTest("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingFieldQualified.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/variables/changeToPropertyName/beforeInaccessibleBackingFieldQualified.kt");
+                doTest(fileName);
             }
             
         }
@@ -2564,6 +3020,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
     }
     
     @TestMetadata("idea/testData/quickfix/when")
+    @TestDataPath("$PROJECT_ROOT")
     public static class When extends AbstractQuickFixTest {
         public void testAllFilesPresentInWhen() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^before(\\w+)\\.kt$"), true);
@@ -2571,22 +3028,26 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
         
         @TestMetadata("beforeElseNotLastInWhen.kt")
         public void testElseNotLastInWhen() throws Exception {
-            doTest("idea/testData/quickfix/when/beforeElseNotLastInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeElseNotLastInWhen.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoElseInWhenWithBranches.kt")
         public void testNoElseInWhenWithBranches() throws Exception {
-            doTest("idea/testData/quickfix/when/beforeNoElseInWhenWithBranches.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeNoElseInWhenWithBranches.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeNoElseInWhenWithoutBranches.kt")
         public void testNoElseInWhenWithoutBranches() throws Exception {
-            doTest("idea/testData/quickfix/when/beforeNoElseInWhenWithoutBranches.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeNoElseInWhenWithoutBranches.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("beforeTwoElseBranchesInWhen.kt")
         public void testTwoElseBranchesInWhen() throws Exception {
-            doTest("idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java
index bca7d2c92f2..b31969d253a 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.refactoring.inline;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/refactoring/inline")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({InlineTestGenerated.AddParenthesis.class, InlineTestGenerated.ExplicateParameterTypes.class, InlineTestGenerated.ExplicateTypeArgument.class, InlineTestGenerated.Property.class})
 public class InlineTestGenerated extends AbstractInlineTest {
     public void testAllFilesPresentInInline() throws Exception {
@@ -36,65 +38,78 @@ public class InlineTestGenerated extends AbstractInlineTest {
     
     @TestMetadata("Basic.kt")
     public void testBasic() throws Exception {
-        doTest("idea/testData/refactoring/inline/Basic.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/Basic.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("BasicCaretOnDeclaration.kt")
     public void testBasicCaretOnDeclaration() throws Exception {
-        doTest("idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/BasicCaretOnDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionLiteral.kt")
     public void testInFunctionLiteral() throws Exception {
-        doTest("idea/testData/refactoring/inline/InFunctionLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/InFunctionLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MethodReference.kt")
     public void testMethodReference() throws Exception {
-        doTest("idea/testData/refactoring/inline/MethodReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MethodReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MultipleInitializers.kt")
     public void testMultipleInitializers() throws Exception {
-        doTest("idea/testData/refactoring/inline/MultipleInitializers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleInitializers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MultipleUsages.kt")
     public void testMultipleUsages() throws Exception {
-        doTest("idea/testData/refactoring/inline/MultipleUsages.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/MultipleUsages.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Parameter.kt")
     public void testParameter() throws Exception {
-        doTest("idea/testData/refactoring/inline/Parameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/Parameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SeparateInitializer.kt")
     public void testSeparateInitializer() throws Exception {
-        doTest("idea/testData/refactoring/inline/SeparateInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SeparateInitializerInTry.kt")
     public void testSeparateInitializerInTry() throws Exception {
-        doTest("idea/testData/refactoring/inline/SeparateInitializerInTry.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/SeparateInitializerInTry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("UsedInAssignment.kt")
     public void testUsedInAssignment() throws Exception {
-        doTest("idea/testData/refactoring/inline/UsedInAssignment.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/UsedInAssignment.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ValWithoutInitializer.kt")
     public void testValWithoutInitializer() throws Exception {
-        doTest("idea/testData/refactoring/inline/ValWithoutInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/ValWithoutInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Var.kt")
     public void testVar() throws Exception {
-        doTest("idea/testData/refactoring/inline/Var.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/Var.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("idea/testData/refactoring/inline/addParenthesis")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AddParenthesis extends AbstractInlineTest {
         public void testAllFilesPresentInAddParenthesis() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -102,157 +117,188 @@ public class InlineTestGenerated extends AbstractInlineTest {
         
         @TestMetadata("ArrayAccess.kt")
         public void testArrayAccess() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayAccessDontAdd.kt")
         public void testArrayAccessDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ArrayAccessDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Binary.kt")
         public void testBinary() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/Binary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Binary.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("BinaryDontAdd.kt")
         public void testBinaryDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/BinaryDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Call.kt")
         public void testCall() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/Call.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Call.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CallDontAdd.kt")
         public void testCallDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/CallDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Colon.kt")
         public void testColon() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/Colon.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Colon.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ColonDontAdd.kt")
         public void testColonDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/ColonDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("If.kt")
         public void testIf() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/If.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/If.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoArrayAccess.kt")
         public void testIfIntoArrayAccess() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccess.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoArrayAccessBrackets.kt")
         public void testIfIntoArrayAccessBrackets() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoArrayAccessBrackets.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoBinaryLeft.kt")
         public void testIfIntoBinaryLeft() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryLeft.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoBinaryRight.kt")
         public void testIfIntoBinaryRight() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRight.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoBinaryRightLeft.kt")
         public void testIfIntoBinaryRightLeft() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeft.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoBinaryRightLeftDontAdd.kt")
         public void testIfIntoBinaryRightLeftDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoBinaryRightLeftDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoPostfix.kt")
         public void testIfIntoPostfix() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPostfix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IfIntoPrefix.kt")
         public void testIfIntoPrefix() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IfIntoPrefix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IsDontAdd.kt")
         public void testIsDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IsIntoCall.kt")
         public void testIsIntoCall() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/IsIntoCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeftAssociative.kt")
         public void testLeftAssociative() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociative.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeftAssociativeBoolean.kt")
         public void testLeftAssociativeBoolean() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeBoolean.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeftAssociativeDontAdd.kt")
         public void testLeftAssociativeDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/LeftAssociativeDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PostfixIntoPrefix.kt")
         public void testPostfixIntoPrefix() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PostfixIntoPrefix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrefixIntoPostfix.kt")
         public void testPrefixIntoPostfix() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/PrefixIntoPostfix.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Qualified.kt")
         public void testQualified() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/Qualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/Qualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedDontAdd.kt")
         public void testQualifiedDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/QualifiedDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringTemplate.kt")
         public void testStringTemplate() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringTemplateAlreadyInBraces.kt")
         public void testStringTemplateAlreadyInBraces() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateAlreadyInBraces.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringTemplateDontAdd.kt")
         public void testStringTemplateDontAdd() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/StringTemplateDontAdd.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnaryIntoBinary.kt")
         public void testUnaryIntoBinary() throws Exception {
-            doTest("idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/addParenthesis/UnaryIntoBinary.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/refactoring/inline/explicateParameterTypes")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ExplicateParameterTypes extends AbstractInlineTest {
         public void testAllFilesPresentInExplicateParameterTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -260,42 +306,50 @@ public class InlineTestGenerated extends AbstractInlineTest {
         
         @TestMetadata("EnoughDontExplicate.kt")
         public void testEnoughDontExplicate() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/EnoughDontExplicate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ErrorTypes.kt")
         public void testErrorTypes() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ErrorTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("It.kt")
         public void testIt() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/It.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/It.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ItMultiLine.kt")
         public void testItMultiLine() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/ItMultiLine.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Parenthesized.kt")
         public void testParenthesized() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Parenthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Simplest.kt")
         public void testSimplest() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/Simplest.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TrivialDontExplicate.kt")
         public void testTrivialDontExplicate() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateParameterTypes/TrivialDontExplicate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/refactoring/inline/explicateTypeArgument")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ExplicateTypeArgument extends AbstractInlineTest {
         public void testAllFilesPresentInExplicateTypeArgument() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -303,52 +357,62 @@ public class InlineTestGenerated extends AbstractInlineTest {
         
         @TestMetadata("DeeperNestedCall.kt")
         public void testDeeperNestedCall() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/DeeperNestedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EnoughDontExplicate.kt")
         public void testEnoughDontExplicate() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/EnoughDontExplicate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExplicateForSome.kt")
         public void testExplicateForSome() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/ExplicateForSome.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InStringTemplate.kt")
         public void testInStringTemplate() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/InStringTemplate.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedCall.kt")
         public void testNestedCall() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/NestedCall.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Parenthesized.kt")
         public void testParenthesized() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Parenthesized.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Qualified.kt")
         public void testQualified() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Qualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Simplest.kt")
         public void testSimplest() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/Simplest.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TrivialDontExplicate.kt")
         public void testTrivialDontExplicate() throws Exception {
-            doTest("idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/explicateTypeArgument/TrivialDontExplicate.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/refactoring/inline/property")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Property extends AbstractInlineTest {
         public void testAllFilesPresentInProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -356,42 +420,50 @@ public class InlineTestGenerated extends AbstractInlineTest {
         
         @TestMetadata("Basic.kt")
         public void testBasic() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/Basic.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/Basic.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectProperty.kt")
         public void testClassObjectProperty() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/ClassObjectProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ClassObjectProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionProperty.kt")
         public void testExtensionProperty() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/ExtensionProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ExtensionProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InstanceProperty.kt")
         public void testInstanceProperty() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/InstanceProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/InstanceProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectProperty.kt")
         public void testObjectProperty() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/ObjectProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/ObjectProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("QualifiedUsage.kt")
         public void testQualifiedUsage() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/QualifiedUsage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/QualifiedUsage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WithGetter.kt")
         public void testWithGetter() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/WithGetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithGetter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WithInitializerAndGetter.kt")
         public void testWithInitializerAndGetter() throws Exception {
-            doTest("idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/inline/property/WithInitializerAndGetter.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java
index a557106a2f6..823f25429de 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetExtractionTestGenerated.IntroduceVariable.class, JetExtractionTestGenerated.ExtractFunction.class})
 public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
     @TestMetadata("idea/testData/refactoring/introduceVariable")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IntroduceVariable extends AbstractJetExtractionTest {
         public void testAllFilesPresentInIntroduceVariable() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceVariable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,177 +39,212 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         
         @TestMetadata("ArrayAccessExpr.kt")
         public void testArrayAccessExpr() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/ArrayAccessExpr.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ArrayAccessExpr.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("ClassBody.kt")
         public void testClassBody() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/ClassBody.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ClassBody.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("DoWhileAddBlock.kt")
         public void testDoWhileAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/DoWhileAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("DoWhileAddBlockInner.kt")
         public void testDoWhileAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/DoWhileAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/DoWhileAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("FewOccurrences.kt")
         public void testFewOccurrences() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/FewOccurrences.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FewOccurrences.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("FunctionAddBlock.kt")
         public void testFunctionAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/FunctionAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("FunctionAddBlockInner.kt")
         public void testFunctionAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/FunctionAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("FunctionLiteral.kt")
         public void testFunctionLiteral() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/FunctionLiteral.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteral.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("FunctionLiteralFromExpected.kt")
         public void testFunctionLiteralFromExpected() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/FunctionLiteralFromExpected.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/FunctionLiteralFromExpected.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("IfCondition.kt")
         public void testIfCondition() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/IfCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfCondition.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("IfElseAddBlock.kt")
         public void testIfElseAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/IfElseAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("IfElseAddBlockInner.kt")
         public void testIfElseAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/IfElseAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfElseAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("IfThenAddBlock.kt")
         public void testIfThenAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/IfThenAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("IfThenAddBlockInner.kt")
         public void testIfThenAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/IfThenAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/IfThenAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("It.kt")
         public void testIt() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/It.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/It.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("LoopRange.kt")
         public void testLoopRange() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/LoopRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/LoopRange.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("ManyInnerOccurences.kt")
         public void testManyInnerOccurences() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/ManyInnerOccurences.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyInnerOccurences.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("ManyOccurrences.kt")
         public void testManyOccurrences() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/ManyOccurrences.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ManyOccurrences.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("noConflictWithInnerVariable.kt")
         public void testNoConflictWithInnerVariable() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/noConflictWithInnerVariable.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/noConflictWithInnerVariable.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("NoExplicitReceivers.kt")
         public void testNoExplicitReceivers() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceivers.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("NoExplicitReceiversUnresolved.kt")
         public void testNoExplicitReceiversUnresolved() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/NoExplicitReceiversUnresolved.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/NoExplicitReceiversUnresolved.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("nonEquivalentReceivers.kt")
         public void testNonEquivalentReceivers() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/nonEquivalentReceivers.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("OneExplicitReceiver.kt")
         public void testOneExplicitReceiver() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/OneExplicitReceiver.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("ReplaceOccurence.kt")
         public void testReplaceOccurence() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/ReplaceOccurence.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/ReplaceOccurence.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/Simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/Simple.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("SimpleCreateValue.kt")
         public void testSimpleCreateValue() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/SimpleCreateValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/SimpleCreateValue.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("StringInjection.kt")
         public void testStringInjection() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/StringInjection.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/StringInjection.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("TwoExplicitReceivers.kt")
         public void testTwoExplicitReceivers() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/TwoExplicitReceivers.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhenAddBlock.kt")
         public void testWhenAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhenAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhenAddBlockInner.kt")
         public void testWhenAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhenAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhenParts.kt")
         public void testWhenParts() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhenParts.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhenParts.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhileAddBlock.kt")
         public void testWhileAddBlock() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhileAddBlock.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlock.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhileAddBlockInner.kt")
         public void testWhileAddBlockInner() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhileAddBlockInner.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileAddBlockInner.kt");
+            doIntroduceVariableTest(fileName);
         }
         
         @TestMetadata("WhileCondition.kt")
         public void testWhileCondition() throws Exception {
-            doIntroduceVariableTest("idea/testData/refactoring/introduceVariable/WhileCondition.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/WhileCondition.kt");
+            doIntroduceVariableTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/refactoring/extractFunction")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ExtractFunction.AsProperty.class, ExtractFunction.Basic.class, ExtractFunction.ControlFlow.class, ExtractFunction.DefaultContainer.class, ExtractFunction.Delegation.class, ExtractFunction.Initializers.class, ExtractFunction.Parameters.class, ExtractFunction.TypeParameters.class})
     public static class ExtractFunction extends AbstractJetExtractionTest {
         public void testAllFilesPresentInExtractFunction() throws Exception {
@@ -215,6 +252,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/asProperty")
+        @TestDataPath("$PROJECT_ROOT")
         public static class AsProperty extends AbstractJetExtractionTest {
             public void testAllFilesPresentInAsProperty() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/asProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -222,27 +260,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("extractToClass.kt")
             public void testExtractToClass() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/asProperty/extractToClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractToClass.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("extractToFile.kt")
             public void testExtractToFile() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/asProperty/extractToFile.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractToFile.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("extractToFunction.kt")
             public void testExtractToFunction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/asProperty/extractToFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractToFunction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("extractWithParams.kt")
             public void testExtractWithParams() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/asProperty/extractWithParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/asProperty/extractWithParams.kt");
+                doExtractFunctionTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/basic")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Basic extends AbstractJetExtractionTest {
             public void testAllFilesPresentInBasic() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -250,97 +293,116 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("fragmentWithComment.kt")
             public void testFragmentWithComment() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithComment.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("fragmentWithMultilineComment.kt")
             public void testFragmentWithMultilineComment() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/fragmentWithMultilineComment.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localClassExtraction.kt")
             public void testLocalClassExtraction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassExtraction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localClassFunctionRef.kt")
             public void testLocalClassFunctionRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localClassFunctionRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassFunctionRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localClassPropertyRef.kt")
             public void testLocalClassPropertyRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localClassPropertyRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localClassPropertyRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localExtraction.kt")
             public void testLocalExtraction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localExtraction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localExtraction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localFunExtraction.kt")
             public void testLocalFunExtraction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localFunExtraction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunExtraction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localFunctionRef.kt")
             public void testLocalFunctionRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localFunctionRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localObjectRef.kt")
             public void testLocalObjectRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/localObjectRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/localObjectRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("malformedExpression.kt")
             public void testMalformedExpression() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/malformedExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedExpression.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("malformedStatements.kt")
             public void testMalformedStatements() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/malformedStatements.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/malformedStatements.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("misdirectedRef.kt")
             public void testMisdirectedRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/misdirectedRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("noConflictWithInnerFunction.kt")
             public void testNoConflictWithInnerFunction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/noConflictWithInnerFunction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("privateMemberInClassObject.kt")
             public void testPrivateMemberInClassObject() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberInClassObject.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("privateMemberRef.kt")
             public void testPrivateMemberRef() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateMemberRef.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("privateNestedClass.kt")
             public void testPrivateNestedClass() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/privateNestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateNestedClass.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("privateSetter.kt")
             public void testPrivateSetter() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/privateSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/privateSetter.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("refInReturn.kt")
             public void testRefInReturn() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/basic/refInReturn.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/refInReturn.kt");
+                doExtractFunctionTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({ControlFlow.ConditionalJumps.class, ControlFlow.Default.class, ControlFlow.DefiniteReturns.class, ControlFlow.EvaluateExpression.class, ControlFlow.Initializer.class, ControlFlow.OutputValues.class, ControlFlow.Throws.class, ControlFlow.Unextractable.class})
         public static class ControlFlow extends AbstractJetExtractionTest {
             public void testAllFilesPresentInControlFlow() throws Exception {
@@ -348,6 +410,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ConditionalJumps extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInConditionalJumps() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -355,57 +418,68 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("conditionalBreakWithIf.kt")
                 public void testConditionalBreakWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalBreakWithIfAndExtraVars.kt")
                 public void testConditionalBreakWithIfAndExtraVars() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfAndExtraVars.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalBreakWithIfElse.kt")
                 public void testConditionalBreakWithIfElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithIfElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalBreakWithWhen.kt")
                 public void testConditionalBreakWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalBreakWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalReturnWithIf.kt")
                 public void testConditionalReturnWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalReturnWithIfElse.kt")
                 public void testConditionalReturnWithIfElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithIfElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("conditionalReturnWithWhen.kt")
                 public void testConditionalReturnWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/conditionalReturnWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("unconditionalBreakWithIf.kt")
                 public void testUnconditionalBreakWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("unconditionalBreakWithIfElse.kt")
                 public void testUnconditionalBreakWithIfElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithIfElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("unconditionalBreakWithWhen.kt")
                 public void testUnconditionalBreakWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps/unconditionalBreakWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/default")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Default extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInDefault() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/default"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -413,42 +487,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("defaultCF.kt")
                 public void testDefaultCF() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCF.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("defaultCFWithExtraVars.kt")
                 public void testDefaultCFWithExtraVars() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithExtraVars.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("defaultCFWithJumps.kt")
                 public void testDefaultCFWithJumps() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/defaultCFWithJumps.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("ignoredReturnValueWithIf.kt")
                 public void testIgnoredReturnValueWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("ignoredReturnValueWithIfNoBlocks.kt")
                 public void testIgnoredReturnValueWithIfNoBlocks() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithIfNoBlocks.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("ignoredReturnValueWithWhen.kt")
                 public void testIgnoredReturnValueWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("ignoredReturnValueWithWhenNoBlocks.kt")
                 public void testIgnoredReturnValueWithWhenNoBlocks() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/default/ignoredReturnValueWithWhenNoBlocks.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns")
+            @TestDataPath("$PROJECT_ROOT")
             public static class DefiniteReturns extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInDefiniteReturns() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -456,22 +538,26 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("definiteReturnWithIf.kt")
                 public void testDefiniteReturnWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("definiteReturnWithWhen.kt")
                 public void testDefiniteReturnWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/definiteReturnWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleDefiniteReturn.kt")
                 public void testSingleDefiniteReturn() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns/singleDefiniteReturn.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression")
+            @TestDataPath("$PROJECT_ROOT")
             public static class EvaluateExpression extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInEvaluateExpression() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -479,72 +565,86 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("evalExprInIfCondition.kt")
                 public void testEvalExprInIfCondition() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfCondition.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExprInIfElse.kt")
                 public void testEvalExprInIfElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExprInIfThen.kt")
                 public void testEvalExprInIfThen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInIfThen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExprInWhenBranch.kt")
                 public void testEvalExprInWhenBranch() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenBranch.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExprInWhenCondition.kt")
                 public void testEvalExprInWhenCondition() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenCondition.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExprInWhenSubject.kt")
                 public void testEvalExprInWhenSubject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExprInWhenSubject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExpressionBodyFunction.kt")
                 public void testEvalExpressionBodyFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalExpressionBodyFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalIfExpr.kt")
                 public void testEvalIfExpr() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalIfExpr.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalWhenExpr.kt")
                 public void testEvalWhenExpr() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/evalWhenExpr.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("simpleEvalExpr.kt")
                 public void testSimpleEvalExpr() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/simpleEvalExpr.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("trailingLambdaEmptyArgList.kt")
                 public void testTrailingLambdaEmptyArgList() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaEmptyArgList.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("trailingLambdaNoArgList.kt")
                 public void testTrailingLambdaNoArgList() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNoArgList.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("trailingLambdaNonEmptyArgList.kt")
                 public void testTrailingLambdaNonEmptyArgList() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression/trailingLambdaNonEmptyArgList.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Initializer extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInInitializer() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/initializer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -552,42 +652,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("propertyWithInitializer.kt")
                 public void testPropertyWithInitializer() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializer.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("propertyWithInitializerAndExtraVars.kt")
                 public void testPropertyWithInitializerAndExtraVars() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndExtraVars.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("propertyWithInitializerAndUnusedVars.kt")
                 public void testPropertyWithInitializerAndUnusedVars() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithInitializerAndUnusedVars.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("propertyWithSeparateInitializer.kt")
                 public void testPropertyWithSeparateInitializer() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/propertyWithSeparateInitializer.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("valueUsedInAnonymousObject.kt")
                 public void testValueUsedInAnonymousObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInAnonymousObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("valueUsedInLambda.kt")
                 public void testValueUsedInLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("valueUsedInLocalFunction.kt")
                 public void testValueUsedInLocalFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer/valueUsedInLocalFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues")
+            @TestDataPath("$PROJECT_ROOT")
             public static class OutputValues extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInOutputValues() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/outputValues"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -595,57 +703,68 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("multipleOutputValues.kt")
                 public void testMultipleOutputValues() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValues.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValues.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleOutputValuesWithIf.kt")
                 public void testMultipleOutputValuesWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleOutputValuesWithWhen.kt")
                 public void testMultipleOutputValuesWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/multipleOutputValuesWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleOutputValue.kt")
                 public void testSingleOutputValue() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleOutputValueWithIf.kt")
                 public void testSingleOutputValueWithIf() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIf.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleOutputValueWithIfElse.kt")
                 public void testSingleOutputValueWithIfElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithIfElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleOutputValueWithWhen.kt")
                 public void testSingleOutputValueWithWhen() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhen.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("singleOutputValueWithWhenElse.kt")
                 public void testSingleOutputValueWithWhenElse() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValueWithWhenElse.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("valuesUsedInLambdaOnly.kt")
                 public void testValuesUsedInLambdaOnly() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInLambdaOnly.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("valuesUsedInNestedBlock.kt")
                 public void testValuesUsedInNestedBlock() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues/valuesUsedInNestedBlock.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Throws extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInThrows() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/throws"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -653,37 +772,44 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("breakWithThrow.kt")
                 public void testBreakWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/breakWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("continueWithThrow.kt")
                 public void testContinueWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/continueWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExpressionWithThrow.kt")
                 public void testEvalExpressionWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/evalExpressionWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("nonValuedReturnWithThrow.kt")
                 public void testNonValuedReturnWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/nonValuedReturnWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("outputValueWithThrow.kt")
                 public void testOutputValueWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/outputValueWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("returnWithThrow.kt")
                 public void testReturnWithThrow() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws/returnWithThrow.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Unextractable extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInUnextractable() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/unextractable"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -691,47 +817,56 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("anonymousObject.kt")
                 public void testAnonymousObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/anonymousObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/anonymousObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("evalExpressionWithReturn.kt")
                 public void testEvalExpressionWithReturn() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/evalExpressionWithReturn.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/evalExpressionWithReturn.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("jumpsAndReturns.kt")
                 public void testJumpsAndReturns() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/jumpsAndReturns.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/jumpsAndReturns.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleInitalizersWithNonLocalUsages.kt")
                 public void testMultipleInitalizersWithNonLocalUsages() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleInitalizersWithNonLocalUsages.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleInitalizersWithNonLocalUsages.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleJumps.kt")
                 public void testMultipleJumps() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleJumps.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleJumps.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleReturnsWithDefault.kt")
                 public void testMultipleReturnsWithDefault() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleReturnsWithDefault.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/multipleReturnsWithDefault.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("outputValueWithExpression.kt")
                 public void testOutputValueWithExpression() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/outputValueWithExpression.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/outputValueWithExpression.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("outputValueWithReturn.kt")
                 public void testOutputValueWithReturn() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/outputValueWithReturn.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/outputValueWithReturn.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("variablesOutOfScope.kt")
                 public void testVariablesOutOfScope() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/controlFlow/unextractable/variablesOutOfScope.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable/variablesOutOfScope.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
@@ -752,6 +887,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/defaultContainer")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DefaultContainer extends AbstractJetExtractionTest {
             public void testAllFilesPresentInDefaultContainer() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/defaultContainer"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -759,42 +895,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("anonymousObject.kt")
             public void testAnonymousObject() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/anonymousObject.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("classFunction.kt")
             public void testClassFunction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/classFunction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("lambda.kt")
             public void testLambda() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/lambda.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localClass.kt")
             public void testLocalClass() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localClass.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localFunction.kt")
             public void testLocalFunction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/localFunction.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("nestedLambda.kt")
             public void testNestedLambda() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/nestedLambda.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("topLevelFunction.kt")
             public void testTopLevelFunction() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/defaultContainer/topLevelFunction.kt");
+                doExtractFunctionTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/delegation")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Delegation extends AbstractJetExtractionTest {
             public void testAllFilesPresentInDelegation() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/delegation"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -802,22 +946,26 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("delegationByExpression.kt")
             public void testDelegationByExpression() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpression.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("delegationByExpressionFull.kt")
             public void testDelegationByExpressionFull() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationByExpressionFull.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("delegationBySuperCall.kt")
             public void testDelegationBySuperCall() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/delegation/delegationBySuperCall.kt");
+                doExtractFunctionTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/initializers")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Initializers.Accessors.class, Initializers.Classes.class, Initializers.Functions.class, Initializers.Properties.class})
         public static class Initializers extends AbstractJetExtractionTest {
             public void testAllFilesPresentInInitializers() throws Exception {
@@ -825,6 +973,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/accessors")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Accessors extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInAccessors() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/accessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -832,27 +981,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("memberProperty.kt")
                 public void testMemberProperty() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberProperty.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberPropertyWithLambda.kt")
                 public void testMemberPropertyWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/memberPropertyWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelProperty.kt")
                 public void testTopLevelProperty() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelProperty.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelPropertyWithLambda.kt")
                 public void testTopLevelPropertyWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/accessors/topLevelPropertyWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/classes")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Classes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInClasses() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -860,27 +1014,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("classInitializer.kt")
                 public void testClassInitializer() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializer.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("classInitializerWithLambda.kt")
                 public void testClassInitializerWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classInitializerWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("classParameters.kt")
                 public void testClassParameters() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParameters.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("classParametersWithLambda.kt")
                 public void testClassParametersWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/classes/classParametersWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/functions")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Functions extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInFunctions() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/functions"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -888,67 +1047,80 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("localFunction.kt")
                 public void testLocalFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("localFunctionParameters.kt")
                 public void testLocalFunctionParameters() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParameters.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("localFunctionParametersWithLambda.kt")
                 public void testLocalFunctionParametersWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParametersWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionParametersWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("localFunctionWithLambda.kt")
                 public void testLocalFunctionWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/localFunctionWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberFunction.kt")
                 public void testMemberFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberFunctionParameters.kt")
                 public void testMemberFunctionParameters() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParameters.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberFunctionParametersWithLambda.kt")
                 public void testMemberFunctionParametersWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionParametersWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberFunctionWithLambda.kt")
                 public void testMemberFunctionWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/memberFunctionWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelFunction.kt")
                 public void testTopLevelFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelFunctionParameters.kt")
                 public void testTopLevelFunctionParameters() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParameters.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelFunctionParametersWithLambda.kt")
                 public void testTopLevelFunctionParametersWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionParametersWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelFunctionWithLambda.kt")
                 public void testTopLevelFunctionWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/functions/topLevelFunctionWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/initializers/properties")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Properties extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInProperties() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/properties"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -956,42 +1128,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("localProperty.kt")
                 public void testLocalProperty() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localProperty.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("localPropertyWithLambda.kt")
                 public void testLocalPropertyWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/localPropertyWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberProperty.kt")
                 public void testMemberProperty() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberProperty.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("memberPropertyWithLambda.kt")
                 public void testMemberPropertyWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/memberPropertyWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multiDeclaration.kt")
                 public void testMultiDeclaration() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/multiDeclaration.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("nestedInMultiDeclaration.kt")
                 public void testNestedInMultiDeclaration() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/nestedInMultiDeclaration.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/nestedInMultiDeclaration.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelProperty.kt")
                 public void testTopLevelProperty() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelProperty.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("topLevelPropertyWithLambda.kt")
                 public void testTopLevelPropertyWithLambda() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/initializers/properties/topLevelPropertyWithLambda.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
@@ -1008,6 +1188,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/parameters")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({Parameters.CandidateTypes.class, Parameters.ExtractSuper.class, Parameters.ExtractThis.class, Parameters.It.class, Parameters.Misc.class, Parameters.NonDenotableTypes.class})
         public static class Parameters extends AbstractJetExtractionTest {
             public void testAllFilesPresentInParameters() throws Exception {
@@ -1015,6 +1196,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes")
+            @TestDataPath("$PROJECT_ROOT")
             public static class CandidateTypes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInCandidateTypes() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/candidateTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1022,37 +1204,44 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("nonNullableTypes.kt")
                 public void testNonNullableTypes() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nonNullableTypes.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("nullableTypes.kt")
                 public void testNullableTypes() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/nullableTypes.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("typeHierarchy1.kt")
                 public void testTypeHierarchy1() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy1.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("typeHierarchy2.kt")
                 public void testTypeHierarchy2() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy2.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("typeHierarchy3.kt")
                 public void testTypeHierarchy3() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy3.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("typeHierarchy4.kt")
                 public void testTypeHierarchy4() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes/typeHierarchy4.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ExtractSuper extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInExtractSuper() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractSuper"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1060,27 +1249,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("labeledSuperPropertyCall.kt")
                 public void testLabeledSuperPropertyCall() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/labeledSuperPropertyCall.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("superFunctionCall.kt")
                 public void testSuperFunctionCall() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractSuper/superFunctionCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superFunctionCall.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("superLabeledFunctionCall.kt")
                 public void testSuperLabeledFunctionCall() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractSuper/superLabeledFunctionCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superLabeledFunctionCall.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("superPropertyCall.kt")
                 public void testSuperPropertyCall() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper/superPropertyCall.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis")
+            @TestDataPath("$PROJECT_ROOT")
             public static class ExtractThis extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInExtractThis() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractThis"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1088,42 +1282,50 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("explicitLabeledThisInMember.kt")
                 public void testExplicitLabeledThisInMember() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitLabeledThisInMember.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("explicitThisInExtension.kt")
                 public void testExplicitThisInExtension() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInExtension.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("explicitThisInMember.kt")
                 public void testExplicitThisInMember() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/explicitThisInMember.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("implicitAndExplicitLabeledThisInMember.kt")
                 public void testImplicitAndExplicitLabeledThisInMember() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitLabeledThisInMember.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("implicitAndExplicitThisInExtension.kt")
                 public void testImplicitAndExplicitThisInExtension() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitAndExplicitThisInExtension.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("implicitThisInExtension.kt")
                 public void testImplicitThisInExtension() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInExtension.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("implicitThisInMember.kt")
                 public void testImplicitThisInMember() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis/implicitThisInMember.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/it")
+            @TestDataPath("$PROJECT_ROOT")
             public static class It extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInIt() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/it"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1131,27 +1333,32 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("innerIt.kt")
                 public void testInnerIt() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/innerIt.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("lambdaWithIt.kt")
                 public void testLambdaWithIt() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/lambdaWithIt.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("outerIt.kt")
                 public void testOuterIt() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/outerIt.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("simpleIt.kt")
                 public void testSimpleIt() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/it/simpleIt.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/misc")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Misc extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInMisc() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/misc"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1159,92 +1366,110 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("classObject.kt")
                 public void testClassObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/classObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("innerClassObject.kt")
                 public void testInnerClassObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/innerClassObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("kt5001.kt")
                 public void testKt5001() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/kt5001.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multiDeclaration.kt")
                 public void testMultiDeclaration() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multiDeclaration.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("multipleOccurrences.kt")
                 public void testMultipleOccurrences() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/multipleOccurrences.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedAnnotation.kt")
                 public void testQualifiedAnnotation() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedAnnotation.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedClassObject.kt")
                 public void testQualifiedClassObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedClassObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedEnum.kt")
                 public void testQualifiedEnum() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedEnum.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedObject.kt")
                 public void testQualifiedObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedPackage.kt")
                 public void testQualifiedPackage() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedPackage.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedTypeArg.kt")
                 public void testQualifiedTypeArg() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeArg.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedTypeInValueArg.kt")
                 public void testQualifiedTypeInValueArg() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeInValueArg.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("qualifiedTypeRef.kt")
                 public void testQualifiedTypeRef() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/qualifiedTypeRef.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("reducedParameterList.kt")
                 public void testReducedParameterList() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/reducedParameterList.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("typeRef.kt")
                 public void testTypeRef() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/typeRef.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("usagesInCallArgs.kt")
                 public void testUsagesInCallArgs() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/usagesInCallArgs.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("variableAsFunction.kt")
                 public void testVariableAsFunction() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/misc/variableAsFunction.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
             
             @TestMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes")
+            @TestDataPath("$PROJECT_ROOT")
             public static class NonDenotableTypes extends AbstractJetExtractionTest {
                 public void testAllFilesPresentInNonDenotableTypes() throws Exception {
                     JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1252,12 +1477,14 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
                 
                 @TestMetadata("anonymousObject.kt")
                 public void testAnonymousObject() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/anonymousObject.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
                 @TestMetadata("localClass.kt")
                 public void testLocalClass() throws Exception {
-                    doExtractFunctionTest("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClass.kt");
+                    String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes/localClass.kt");
+                    doExtractFunctionTest(fileName);
                 }
                 
             }
@@ -1276,6 +1503,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
         }
         
         @TestMetadata("idea/testData/refactoring/extractFunction/typeParameters")
+        @TestDataPath("$PROJECT_ROOT")
         public static class TypeParameters extends AbstractJetExtractionTest {
             public void testAllFilesPresentInTypeParameters() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1283,62 +1511,74 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest {
             
             @TestMetadata("localClassInBound.kt")
             public void testLocalClassInBound() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInBound.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("localClassInTypeConstraint.kt")
             public void testLocalClassInTypeConstraint() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/localClassInTypeConstraint.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("simpleTypeParameter.kt")
             public void testSimpleTypeParameter() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameter.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("simpleTypeParameterWithConstraint.kt")
             public void testSimpleTypeParameterWithConstraint() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/simpleTypeParameterWithConstraint.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParamInArgument.kt")
             public void testTypeParamInArgument() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParamInArgument.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersAndConstraintsCombined1.kt")
             public void testTypeParametersAndConstraintsCombined1() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined1.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersAndConstraintsCombined2.kt")
             public void testTypeParametersAndConstraintsCombined2() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined2.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersAndConstraintsCombined3.kt")
             public void testTypeParametersAndConstraintsCombined3() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersAndConstraintsCombined3.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersCombined1.kt")
             public void testTypeParametersCombined1() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined1.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersCombined2.kt")
             public void testTypeParametersCombined2() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined2.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersCombined3.kt")
             public void testTypeParametersCombined3() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombined3.kt");
+                doExtractFunctionTest(fileName);
             }
             
             @TestMetadata("typeParametersCombinedAndThis.kt")
             public void testTypeParametersCombinedAndThis() throws Exception {
-                doExtractFunctionTest("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/typeParameters/typeParametersCombinedAndThis.kt");
+                doExtractFunctionTest(fileName);
             }
             
         }
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
index 62c2a9f12fc..99cee8663ae 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.refactoring.move;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/refactoring/move")
+@TestDataPath("$PROJECT_ROOT")
 public class JetMoveTestGenerated extends AbstractJetMoveTest {
     public void testAllFilesPresentInMove() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$"));
@@ -35,237 +37,284 @@ public class JetMoveTestGenerated extends AbstractJetMoveTest {
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test")
     public void testJava_moveClass_moveAsMember_moveClassToExternalNestedClass_MoveClassToExternalNestedClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToExternalNestedClass/moveClassToExternalNestedClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test")
     public void testJava_moveClass_moveAsMember_moveClassToNestedSiblingClass_MoveClassToNestedSiblingClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToNestedSiblingClass/moveClassToNestedSiblingClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test")
     public void testJava_moveClass_moveAsMember_moveClassToTopLevelClass_MoveClassToTopLevelClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClass/moveClassToTopLevelClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test")
     public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePackageLocal_MoveClassToTopLevelClassAndMakePackageLocal() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePackageLocal/moveClassToTopLevelClassAndMakePackageLocal.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test")
     public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassAndMakePrivate_MoveClassToTopLevelClassAndMakePrivate() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassAndMakePrivate/moveClassToTopLevelClassAndMakePrivate.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test")
     public void testJava_moveClass_moveAsMember_moveClassToTopLevelClassOfAnotherPackage_MoveClassToTopLevelClassOfAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveAsMember/moveClassToTopLevelClassOfAnotherPackage/moveClassToTopLevelClassOfAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test")
     public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInAnotherPackage_MoveNestedClassToTopLevelInAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInAnotherPackage/moveNestedClassToTopLevelInAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test")
     public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackage_MoveNestedClassToTopLevelInTheSamePackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackage/moveNestedClassToTopLevelInTheSamePackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test")
     public void testJava_moveClass_moveInnerToTop_moveNestedClassToTopLevelInTheSamePackageAndRename_MoveNestedClassToTopLevelInTheSamePackageAndRename() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndRename/moveNestedClassToTopLevelInTheSamePackageAndRename.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test")
     public void testJava_moveClass_moveTop_moveTopLevelClassToAnotherPackage_MoveTopLevelClassToAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTop/moveTopLevelClassToAnotherPackage/moveTopLevelClassToAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test")
     public void testJava_moveClass_moveTopToInner_moveTopLevelClassToNestedClass_MoveTopLevelClassToTopLevelClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToNestedClass/moveTopLevelClassToTopLevelClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test")
     public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClass_MoveTopLevelClassToTopLevelClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClass/moveTopLevelClassToTopLevelClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test")
     public void testJava_moveClass_moveTopToInner_moveTopLevelClassToTopLevelClassOfAnotherPackage_MoveTopLevelClassToTopLevelClassOfAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveClass/moveTopToInner/moveTopLevelClassToTopLevelClassOfAnotherPackage/moveTopLevelClassToTopLevelClassOfAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test")
     public void testJava_moveField_moveFieldToExternalNestedClass_MoveFieldToExternalNestedClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToExternalNestedClass/moveFieldToExternalNestedClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test")
     public void testJava_moveField_moveFieldToNestedSiblingClass_MoveFieldToNestedSiblingClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToNestedSiblingClass/moveFieldToNestedSiblingClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test")
     public void testJava_moveField_moveFieldToTopLevelClass_MoveFieldToTopLevelClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClass/moveFieldToTopLevelClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test")
     public void testJava_moveField_moveFieldToTopLevelClassAndMakePackageLocal_MoveFieldToTopLevelClassAndMakePackageLocal() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePackageLocal/moveFieldToTopLevelClassAndMakePackageLocal.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test")
     public void testJava_moveField_moveFieldToTopLevelClassAndMakePrivate_MoveFieldToTopLevelClassAndMakePrivate() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassAndMakePrivate/moveFieldToTopLevelClassAndMakePrivate.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test")
     public void testJava_moveField_moveFieldToTopLevelClassOfAnotherPackage_MoveFieldToTopLevelClassOfAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveField/moveFieldToTopLevelClassOfAnotherPackage/moveFieldToTopLevelClassOfAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test")
     public void testJava_moveFile_moveFileToAnotherPackage_MoveFileToAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveFile/moveFileToAnotherPackage/moveFileToAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test")
     public void testJava_moveMethod_moveMethodToExternalNestedClass_MoveMethodToExternalNestedClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToExternalNestedClass/moveMethodToExternalNestedClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test")
     public void testJava_moveMethod_moveMethodToNestedSiblingClass_MoveMethodToNestedSiblingClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToNestedSiblingClass/moveMethodToNestedSiblingClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test")
     public void testJava_moveMethod_moveMethodToTopLevelClass_MoveMethodToTopLevelClass() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClass/moveMethodToTopLevelClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test")
     public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePackageLocal_MoveMethodToTopLevelClassAndMakePackageLocal() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePackageLocal/moveMethodToTopLevelClassAndMakePackageLocal.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test")
     public void testJava_moveMethod_moveMethodToTopLevelClassAndMakePrivate_MoveMethodToTopLevelClassAndMakePrivate() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassAndMakePrivate/moveMethodToTopLevelClassAndMakePrivate.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test")
     public void testJava_moveMethod_moveMethodToTopLevelClassOfAnotherPackage_MoveMethodToTopLevelClassOfAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/moveMethod/moveMethodToTopLevelClassOfAnotherPackage/moveMethodToTopLevelClassOfAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test")
     public void testJava_movePackage_movePackageToAnotherPackage_MovePackageToAnotherPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/java/movePackage/movePackageToAnotherPackage/movePackageToAnotherPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveFile/moveFileToFile/moveFileToFile.test")
     public void testKotlin_moveFile_moveFileToFile_MoveFileToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveFile/moveFileToFile/moveFileToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileToFile/moveFileToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test")
     public void testKotlin_moveFile_moveFileWithoutPackageRename_MoveFileWithoutPackageRename() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithoutPackageRename/moveFileWithoutPackageRename.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test")
     public void testKotlin_moveFile_moveFileWithPackageRename_MoveFileWithPackageRename() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveFile/moveFileWithPackageRename/moveFileWithPackageRename.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/movePackage/movePackage/movePackage.test")
     public void testKotlin_movePackage_movePackage_MovePackage() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/movePackage/movePackage/movePackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test")
     public void testKotlin_moveTopLevelDeclarations_misc_moveClassWithImportsRetained_MoveClassWithImportsRetained() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveClassWithImportsRetained/moveClassWithImportsRetained.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test")
     public void testKotlin_moveTopLevelDeclarations_misc_moveFunctionWithImportsRetained_MoveFunctionWithImportsRetained() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/misc/moveFunctionWithImportsRetained/moveFunctionWithImportsRetained.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test")
     public void testKotlin_moveTopLevelDeclarations_moveClassToFile_MoveClassToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToFile/moveClassToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test")
     public void testKotlin_moveTopLevelDeclarations_moveClassToPackage_MoveClassToPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackage/moveClassToPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test")
     public void testKotlin_moveTopLevelDeclarations_moveClassToPackageWithConflicts_MoveClassToPackageWithConflicts() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveClassToPackageWithConflicts/moveClassToPackageWithConflicts.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test")
     public void testKotlin_moveTopLevelDeclarations_moveExtensionFunctionToFil_MoveExtensionFunctionToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionFunctionToFil/moveExtensionFunctionToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test")
     public void testKotlin_moveTopLevelDeclarations_moveExtensionPropertyToFile_MoveExtensionPropertyToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveExtensionPropertyToFile/moveExtensionPropertyToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test")
     public void testKotlin_moveTopLevelDeclarations_moveFunctionToFile_MoveFunctionToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToFile/moveFunctionToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test")
     public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackage_MoveFunctionToPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackage/moveFunctionToPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test")
     public void testKotlin_moveTopLevelDeclarations_moveFunctionToPackageWithConflicts_MoveFunctionToPackageWithConflicts() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveFunctionToPackageWithConflicts/moveFunctionToPackageWithConflicts.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test")
     public void testKotlin_moveTopLevelDeclarations_moveObjectToFile_MoveObjectToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToFile/moveObjectToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test")
     public void testKotlin_moveTopLevelDeclarations_moveObjectToPackage_MoveObjectToPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackage/moveObjectToPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test")
     public void testKotlin_moveTopLevelDeclarations_moveObjectToPackageWithConflicts_MoveObjectToPackageWithConflicts() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/moveObjectToPackageWithConflicts/moveObjectToPackageWithConflicts.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test")
     public void testKotlin_moveTopLevelDeclarations_movePropertyToFile_MovePropertyToFile() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToFile/movePropertyToFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test")
     public void testKotlin_moveTopLevelDeclarations_movePropertyToPackage_MovePropertyToPackage() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackage/movePropertyToPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test")
     public void testKotlin_moveTopLevelDeclarations_movePropertyToPackageWithConflicts_MovePropertyToPackageWithConflicts() throws Exception {
-        doTest("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java
index 83f81174d94..61872974820 100644
--- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.refactoring.rename;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/refactoring/rename")
+@TestDataPath("$PROJECT_ROOT")
 public class RenameTestGenerated extends AbstractRenameTest {
     public void testAllFilesPresentInRename() throws Exception {
         JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$"));
@@ -35,197 +37,236 @@ public class RenameTestGenerated extends AbstractRenameTest {
     
     @TestMetadata("renameCompareTo/compareTo.test")
     public void testRenameCompareTo_CompareTo() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameCompareTo/compareTo.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameCompareTo/compareTo.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameContains/contains.test")
     public void testRenameContains_Contains() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameContains/contains.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContains/contains.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameContainsWithConflicts/containsWithConflicts.test")
     public void testRenameContainsWithConflicts_ContainsWithConflicts() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameContainsWithConflicts/containsWithConflicts.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameContainsWithConflicts/containsWithConflicts.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameEquals/equals.test")
     public void testRenameEquals_Equals() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameEquals/equals.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameEquals/equals.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameExplicitComponentFunction/explicitComponentFunction.test")
     public void testRenameExplicitComponentFunction_ExplicitComponentFunction() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameExplicitComponentFunction/explicitComponentFunction.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameExplicitComponentFunction/explicitComponentFunction.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameGet/get.test")
     public void testRenameGet_Get() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameGet/get.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameGet/get.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameInc/inc.test")
     public void testRenameInc_Inc() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameInc/inc.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInc/inc.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameInvoke/invoke.test")
     public void testRenameInvoke_Invoke() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameInvoke/invoke.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameInvoke/invoke.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameIterator/iterator.test")
     public void testRenameIterator_Iterator() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameIterator/iterator.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameIterator/iterator.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameJavaClass/renameJavaClass.test")
     public void testRenameJavaClass_RenameJavaClass() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaClass/renameJavaClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameJavaInterface/renameJavaInterface.test")
     public void testRenameJavaInterface_RenameJavaInterface() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaInterface/renameJavaInterface.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameJavaMethod/javaBaseMethod.test")
     public void testRenameJavaMethod_JavaBaseMethod() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameJavaMethod/javaBaseMethod.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/javaBaseMethod.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameJavaMethod/kotlinOverridenMethod.test")
     public void testRenameJavaMethod_KotlinOverridenMethod() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameJavaMethod/kotlinOverridenMethod.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameJavaMethod/kotlinOverridenMethod.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinBaseMethod/javaWrapperForBaseFunction.test")
     public void testRenameKotlinBaseMethod_JavaWrapperForBaseFunction() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test")
     public void testRenameKotlinBaseMethod_JavaWrapperForOverridenFunctionWithKotlinBase() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinBaseMethod/kotlinBaseFunction.test")
     public void testRenameKotlinBaseMethod_KotlinBaseFunction() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/kotlinBaseFunction.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinBaseMethod/kotlinBaseFunction.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinClass/javaWrapperForKotlinClass.test")
     public void testRenameKotlinClass_JavaWrapperForKotlinClass() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinClass/javaWrapperForKotlinClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/javaWrapperForKotlinClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinClass/kotlinClass.test")
     public void testRenameKotlinClass_KotlinClass() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinClass/kotlinClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClass/kotlinClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinClassConstructor/renameKotlinConstructor.test")
     public void testRenameKotlinClassConstructor_RenameKotlinConstructor() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinClassConstructor/renameKotlinConstructor.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassConstructor/renameKotlinConstructor.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinClassWithFile/javaClassWrapper.test")
     public void testRenameKotlinClassWithFile_JavaClassWrapper() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinClassWithFile/javaClassWrapper.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/javaClassWrapper.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinClassWithFile/kotlinClass.test")
     public void testRenameKotlinClassWithFile_KotlinClass() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinClassWithFile/kotlinClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinClassWithFile/kotlinClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinMethod/javaWrapperForKotlinMethod.test")
     public void testRenameKotlinMethod_JavaWrapperForKotlinMethod() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/javaWrapperForKotlinMethod.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinMethod/renameKotlinMethod.test")
     public void testRenameKotlinMethod_RenameKotlinMethod() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinMethod/renameKotlinMethod.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinMethod/renameKotlinMethod.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinPackage/renameInOtherFile.test")
     public void testRenameKotlinPackage_RenameInOtherFile() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinPackage/renameInOtherFile.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameInOtherFile.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinPackage/renameKotlinPackage.test")
     public void testRenameKotlinPackage_RenameKotlinPackage() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinPackage/renameKotlinPackage.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackage/renameKotlinPackage.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test")
     public void testRenameKotlinPackageClass_JavaWrapperForKotlinPackageClass() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageClass/javaWrapperForKotlinPackageClass.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test")
     public void testRenameKotlinPackageFunctionFromJava_RenameKotlinPackageFunctionFromJava() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinPackageFunctionFromJava/renameKotlinPackageFunctionFromJava.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test")
     public void testRenameKotlinValProperty_RenameAsJavaGetterForExplicitGetter() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameAsJavaGetterForExplicitGetter.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinValProperty/renameBase.test")
     public void testRenameKotlinValProperty_RenameBase() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinValProperty/renameBase.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameBase.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinValProperty/renameOverriden.test")
     public void testRenameKotlinValProperty_RenameOverriden() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinValProperty/renameOverriden.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinValProperty/renameOverriden.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinVarProperty/renameAsJavaGetter.test")
     public void testRenameKotlinVarProperty_RenameAsJavaGetter() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaGetter.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaGetter.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinVarProperty/renameAsJavaSetter.test")
     public void testRenameKotlinVarProperty_RenameAsJavaSetter() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaSetter.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameAsJavaSetter.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinVarProperty/renameBase.test")
     public void testRenameKotlinVarProperty_RenameBase() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinVarProperty/renameBase.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameBase.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameKotlinVarProperty/renameOverriden.test")
     public void testRenameKotlinVarProperty_RenameOverriden() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameKotlinVarProperty/renameOverriden.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameKotlinVarProperty/renameOverriden.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renamePlus/plus.test")
     public void testRenamePlus_Plus() throws Exception {
-        doTest("idea/testData/refactoring/rename/renamePlus/plus.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlus/plus.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renamePlusAssign/plusAssign.test")
     public void testRenamePlusAssign_PlusAssign() throws Exception {
-        doTest("idea/testData/refactoring/rename/renamePlusAssign/plusAssign.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renamePlusAssign/plusAssign.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameSet/set.test")
     public void testRenameSet_Set() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameSet/set.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSet/set.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameSynthesizedComponentFunction/synthesizedComponentFunction.test")
     public void testRenameSynthesizedComponentFunction_SynthesizedComponentFunction() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameSynthesizedComponentFunction/synthesizedComponentFunction.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameSynthesizedComponentFunction/synthesizedComponentFunction.test");
+        doTest(fileName);
     }
     
     @TestMetadata("renameUnaryMinus/unaryMinus.test")
     public void testRenameUnaryMinus_UnaryMinus() throws Exception {
-        doTest("idea/testData/refactoring/rename/renameUnaryMinus/unaryMinus.test");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/refactoring/rename/renameUnaryMinus/unaryMinus.test");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java
index da87406027c..5a879f9a13b 100644
--- a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.structureView;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/structureView/fileStructure")
+@TestDataPath("$PROJECT_ROOT")
 public class KotlinFileStructureTestGenerated extends AbstractKotlinFileStructureTest {
     public void testAllFilesPresentInFileStructure() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/structureView/fileStructure"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -35,82 +37,98 @@ public class KotlinFileStructureTestGenerated extends AbstractKotlinFileStructur
     
     @TestMetadata("CheckLocationForKotlin.kt")
     public void testCheckLocationForKotlin() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/CheckLocationForKotlin.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckLocationForKotlin.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("CheckMemberLocationForJava.kt")
     public void testCheckMemberLocationForJava() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/CheckMemberLocationForJava.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/CheckMemberLocationForJava.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DoNotShowParentsInLocationJava.kt")
     public void testDoNotShowParentsInLocationJava() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/DoNotShowParentsInLocationJava.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/DoNotShowParentsInLocationJava.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("EmptyFile.kt")
     public void testEmptyFile() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/EmptyFile.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/EmptyFile.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedDelegationMethods.kt")
     public void testInheritedDelegationMethods() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedDelegationMethods.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedDelegationMethods.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedInnerClasses.kt")
     public void testInheritedInnerClasses() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedInnerClasses.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedInnerClasses.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedJavaMembers.kt")
     public void testInheritedJavaMembers() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedJavaMembers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedJavaMembers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedLocalKotlin.kt")
     public void testInheritedLocalKotlin() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedLocalKotlin.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedLocalKotlin.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedMembers.kt")
     public void testInheritedMembers() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedMembers.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembers.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedMembersOfEnum.kt")
     public void testInheritedMembersOfEnum() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedMembersOfEnum.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersOfEnum.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedMembersWithSubstitutedTypes.kt")
     public void testInheritedMembersWithSubstitutedTypes() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedMembersWithSubstitutedTypes.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedMembersWithSubstitutedTypes.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedSAMConversion.kt")
     public void testInheritedSAMConversion() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedSAMConversion.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSAMConversion.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InheritedSynthesizedFromDataClass.kt")
     public void testInheritedSynthesizedFromDataClass() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/InheritedSynthesizedFromDataClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/InheritedSynthesizedFromDataClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Render.kt")
     public void testRender() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/Render.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Render.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SeveralClasses.kt")
     public void testSeveralClasses() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/SeveralClasses.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/SeveralClasses.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("Simple.kt")
     public void testSimple() throws Exception {
-        doTest("idea/testData/structureView/fileStructure/Simple.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/structureView/fileStructure/Simple.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java
index ffd49708547..725993815d8 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.stubs;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/loadJava/compiledKotlin")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({LazyResolveByStubTestGenerated.Annotations.class, LazyResolveByStubTestGenerated.Class.class, LazyResolveByStubTestGenerated.ClassFun.class, LazyResolveByStubTestGenerated.ClassObject.class, LazyResolveByStubTestGenerated.Constructor.class, LazyResolveByStubTestGenerated.DataClass.class, LazyResolveByStubTestGenerated.Enum.class, LazyResolveByStubTestGenerated.FromLoadJava.class, LazyResolveByStubTestGenerated.Fun.class, LazyResolveByStubTestGenerated.Inline.class, LazyResolveByStubTestGenerated.Prop.class, LazyResolveByStubTestGenerated.Type.class, LazyResolveByStubTestGenerated.Visibility.class})
 public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTest {
     public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -35,6 +37,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class})
     public static class Annotations extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
@@ -43,20 +46,24 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("AnnotatedAnnotation.kt")
         public void testAnnotatedAnnotation() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AnnotatedMethod.kt")
         public void testAnnotatedMethod() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/AnnotatedMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleAnnotation.kt")
         public void testSimpleAnnotation() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/SimpleAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ClassMembers extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInClassMembers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -64,42 +71,50 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ClassObjectPropertyField.kt")
             public void testClassObjectPropertyField() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/ClassObjectPropertyField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DelegatedProperty.kt")
             public void testDelegatedProperty() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/DelegatedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumArgument.kt")
             public void testEnumArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/EnumArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Function.kt")
             public void testFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Function.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Getter.kt")
             public void testGetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Getter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyField.kt")
             public void testPropertyField() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/PropertyField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Setter.kt")
             public void testSetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers/Setter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Classes extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInClasses() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -107,77 +122,92 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("AnnotationInClassObject.kt")
             public void testAnnotationInClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/AnnotationInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassInClassObject.kt")
             public void testClassInClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassInClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObjectInStaticNestedClass.kt")
             public void testClassObjectInStaticNestedClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Deprecated.kt")
             public void testDeprecated() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Deprecated.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("DollarsInAnnotationName.kt")
             public void testDollarsInAnnotationName() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/DollarsInAnnotationName.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumArgument.kt")
             public void testEnumArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/EnumArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MultipleAnnotations.kt")
             public void testMultipleAnnotations() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/MultipleAnnotations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedAnnotation.kt")
             public void testNestedAnnotation() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedAnnotation.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedClass.kt")
             public void testNestedClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/NestedClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Retention.kt")
             public void testRetention() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Retention.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Simple.kt")
             public void testSimple() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/Simple.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WithArgument.kt")
             public void testWithArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("WithMultipleArguments.kt")
             public void testWithMultipleArguments() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes/WithMultipleArguments.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PackageMembers extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInPackageMembers() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -185,47 +215,56 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("DelegatedProperty.kt")
             public void testDelegatedProperty() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/DelegatedProperty.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumArgument.kt")
             public void testEnumArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumArrayArgument.kt")
             public void testEnumArrayArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/EnumArrayArgument.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Function.kt")
             public void testFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Function.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Getter.kt")
             public void testGetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Getter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyField.kt")
             public void testPropertyField() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/PropertyField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Setter.kt")
             public void testSetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/Setter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("StringArrayArgument.kt")
             public void testStringArrayArgument() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers/StringArrayArgument.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Parameters extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInParameters() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -233,62 +272,74 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("Constructor.kt")
             public void testConstructor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/Constructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("EnumConstructor.kt")
             public void testEnumConstructor() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/EnumConstructor.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionFunction.kt")
             public void testExtensionFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionFunctionInClass.kt")
             public void testExtensionFunctionInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionFunctionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionPropertySetter.kt")
             public void testExtensionPropertySetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ExtensionPropertySetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunctionInClass.kt")
             public void testFunctionInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunctionInTrait.kt")
             public void testFunctionInTrait() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/FunctionInTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ManyAnnotations.kt")
             public void testManyAnnotations() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/ManyAnnotations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertySetterInClass.kt")
             public void testPropertySetterInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/PropertySetterInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevelFunction.kt")
             public void testTopLevelFunction() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelFunction.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevelPropertySetter.kt")
             public void testTopLevelPropertySetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters/TopLevelPropertySetter.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields")
+        @TestDataPath("$PROJECT_ROOT")
         public static class PropertiesWithoutBackingFields extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -296,42 +347,50 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("Class.kt")
             public void testClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Class.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassObject.kt")
             public void testClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionsWithSameNameClass.kt")
             public void testExtensionsWithSameNameClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtensionsWithSameNamePackage.kt")
             public void testExtensionsWithSameNamePackage() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NestedTrait.kt")
             public void testNestedTrait() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TopLevel.kt")
             public void testTopLevel() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Trait.kt")
             public void testTrait() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/Trait.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TraitClassObject.kt")
             public void testTraitClassObject() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.kt");
+                doTest(fileName);
             }
             
         }
@@ -349,6 +408,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Class.JavaBean.class})
     public static class Class extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClass() throws Exception {
@@ -357,170 +417,204 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("Class.kt")
         public void testClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Class.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassInParam.kt")
         public void testClassInParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassInnerClass.kt")
         public void testClassInnerClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassMemberConflict.kt")
         public void testClassMemberConflict() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassMemberConflict.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassOutParam.kt")
         public void testClassOutParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassOutParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParam.kt")
         public void testClassParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamReferencesParam.kt")
         public void testClassParamReferencesParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamReferencesParam2.kt")
         public void testClassParamReferencesParam2() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesParam2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamReferencesSelf.kt")
         public void testClassParamReferencesSelf() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamReferencesSelf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamUpperClassBound.kt")
         public void testClassParamUpperClassBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamUpperClassInterfaceBound.kt")
         public void testClassParamUpperClassInterfaceBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperClassInterfaceBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamUpperInterfaceBound.kt")
         public void testClassParamUpperInterfaceBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassParamUpperInterfaceBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassTwoParams.kt")
         public void testClassTwoParams() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassTwoParams2.kt")
         public void testClassTwoParams2() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/ClassTwoParams2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EnumWithGenericConstructorParameter.kt")
         public void testEnumWithGenericConstructorParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithGenericConstructorParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("EnumWithPrimitiveConstructorParameter.kt")
         public void testEnumWithPrimitiveConstructorParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/EnumWithPrimitiveConstructorParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritClassSimple.kt")
         public void testInheritClassSimple() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassSimple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritClassWithParam.kt")
         public void testInheritClassWithParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritClassWithParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritSubstitutedMethod.kt")
         public void testInheritSubstitutedMethod() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritSubstitutedMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritTraitWithFunctionParam.kt")
         public void testInheritTraitWithFunctionParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithFunctionParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritTraitWithParam.kt")
         public void testInheritTraitWithParam() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InheritTraitWithParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassExtendInnerClass.kt")
         public void testInnerClassExtendInnerClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerClassExtendInnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerGenericClass.kt")
         public void testInnerGenericClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/InnerGenericClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObject.kt")
         public void testNamedObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObjectInClass.kt")
         public void testNamedObjectInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObjectInClassObject.kt")
         public void testNamedObjectInClassObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObjectInNamedObject.kt")
         public void testNamedObjectInNamedObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectInNamedObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NamedObjectWithAnotherTopLevelProperty.kt")
         public void testNamedObjectWithAnotherTopLevelProperty() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClass.kt")
         public void testNestedClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassExtendNestedClass.kt")
         public void testNestedClassExtendNestedClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedClassExtendNestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedGenericClass.kt")
         public void testNestedGenericClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/NestedGenericClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SingleAbstractMethod.kt")
         public void testSingleAbstractMethod() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/SingleAbstractMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Trait.kt")
         public void testTrait() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/Trait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean")
+        @TestDataPath("$PROJECT_ROOT")
         public static class JavaBean extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInJavaBean() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -528,32 +622,38 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("DifferentGetterAndSetter.kt")
             public void testDifferentGetterAndSetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/DifferentGetterAndSetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaBeanAbstractGetter.kt")
             public void testJavaBeanAbstractGetter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanAbstractGetter.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaBeanVal.kt")
             public void testJavaBeanVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaBeanVar.kt")
             public void testJavaBeanVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("JavaBeanVarOfGenericType.kt")
             public void testJavaBeanVarOfGenericType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/JavaBeanVarOfGenericType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("TwoSetters.kt")
             public void testTwoSetters() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean/TwoSetters.kt");
+                doTest(fileName);
             }
             
         }
@@ -567,6 +667,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ClassFun extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClassFun() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -574,37 +675,44 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("ClassInParamUsedInFun.kt")
         public void testClassInParamUsedInFun() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassInParamUsedInFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassParamUsedInFun.kt")
         public void testClassParamUsedInFun() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/ClassParamUsedInFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunDelegationToTraitImpl.kt")
         public void testFunDelegationToTraitImpl() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunDelegationToTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunInParamSuper.kt")
         public void testFunInParamSuper() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/FunInParamSuper.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitFinalFun.kt")
         public void testTraitFinalFun() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitFinalFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitOpenFun.kt")
         public void testTraitOpenFun() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classFun/TraitOpenFun.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ClassObject extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInClassObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -612,67 +720,80 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("ClassObjectDeclaresVal.kt")
         public void testClassObjectDeclaresVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectDeclaresVar.kt")
         public void testClassObjectDeclaresVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDeclaresVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectDefaultVisibility.kt")
         public void testClassObjectDefaultVisibility() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectDefaultVisibility.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectExplicitVisibility.kt")
         public void testClassObjectExplicitVisibility() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExplicitVisibility.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectExtendsTrait.kt")
         public void testClassObjectExtendsTrait() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTrait.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectExtendsTraitWithTP.kt")
         public void testClassObjectExtendsTraitWithTP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectExtendsTraitWithTP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectInClassStaticFields.kt")
         public void testClassObjectInClassStaticFields() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectInTraitStaticFields.kt")
         public void testClassObjectInTraitStaticFields() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObjectPropertyInClass.kt")
         public void testClassObjectPropertyInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/ClassObjectPropertyInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Delegation.kt")
         public void testDelegation() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/Delegation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassInClassObject.kt")
         public void testInnerClassInClassObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/InnerClassInClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleClassObject.kt")
         public void testSimpleClassObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/classObject/SimpleClassObject.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Constructor.Vararg.class})
     public static class Constructor extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInConstructor() throws Exception {
@@ -681,85 +802,102 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("Constructor0.kt")
         public void testConstructor0() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor0.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constructor1.kt")
         public void testConstructor1() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constructor1WithParamDefaultValue.kt")
         public void testConstructor1WithParamDefaultValue() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor1WithParamDefaultValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constructor2WithOneParamDefaultValue.kt")
         public void testConstructor2WithOneParamDefaultValue() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/Constructor2WithOneParamDefaultValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorCollectionParameter.kt")
         public void testConstructorCollectionParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorCollectionParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorGenericDeep.kt")
         public void testConstructorGenericDeep() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericDeep.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorGenericSimple.kt")
         public void testConstructorGenericSimple() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericSimple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorGenericUpperBound.kt")
         public void testConstructorGenericUpperBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorGenericUpperBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTwoDefArgs.kt")
         public void testConstructorWithTwoDefArgs() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoDefArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTwoTypeParameters.kt")
         public void testConstructorWithTwoTypeParameters() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParameters.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt")
         public void testConstructorWithTwoTypeParametersAndOneIntValueParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTwoTypeParametersAndOnePValueParameter.kt")
         public void testConstructorWithTwoTypeParametersAndOnePValueParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParameter.kt")
         public void testConstructorWithTypeParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ConstructorWithTypeParametersEAndOnePValueParameter.kt")
         public void testConstructorWithTypeParametersEAndOnePValueParameter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClassConstructorWithDefArgs.kt")
         public void testInnerClassConstructorWithDefArgs() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/InnerClassConstructorWithDefArgs.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateConstructor1WithParamDefaultValue.kt")
         public void testPrivateConstructor1WithParamDefaultValue() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Vararg extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInVararg() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -767,12 +905,14 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ConstructorNonLastVararg.kt")
             public void testConstructorNonLastVararg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorNonLastVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorVararg.kt")
             public void testConstructorVararg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg/ConstructorVararg.kt");
+                doTest(fileName);
             }
             
         }
@@ -786,6 +926,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DataClass extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInDataClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -793,42 +934,50 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("MixedComponents.kt")
         public void testMixedComponents() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/MixedComponents.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoComponents.kt")
         public void testNoComponents() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/NoComponents.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OneVal.kt")
         public void testOneVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OneVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OpenDataClass.kt")
         public void testOpenDataClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenDataClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OpenPropertyFinalComponent.kt")
         public void testOpenPropertyFinalComponent() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/OpenPropertyFinalComponent.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TwoVals.kt")
         public void testTwoVals() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVals.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TwoVars.kt")
         public void testTwoVars() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/dataClass/TwoVars.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Enum extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -836,32 +985,38 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("enumVisibility.kt")
         public void testEnumVisibility() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumVisibility.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enumWithConstuctor.kt")
         public void testEnumWithConstuctor() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/enumWithConstuctor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerEnum.kt")
         public void testInnerEnum() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerEnumExistingClassObject.kt")
         public void testInnerEnumExistingClassObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/innerEnumExistingClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleEnum.kt")
         public void testSimpleEnum() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/enum/simpleEnum.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class})
     public static class FromLoadJava extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInFromLoadJava() throws Exception {
@@ -870,180 +1025,216 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("ArrayTypeVariance.kt")
         public void testArrayTypeVariance() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ArrayTypeVariance.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassDoesNotOverrideMethod.kt")
         public void testClassDoesNotOverrideMethod() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassObject.kt")
         public void testClassObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectAnnotation.kt")
         public void testClassObjectAnnotation() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/classObjectAnnotation.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithConstVal.kt")
         public void testClassWithConstVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithConstVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypeP.kt")
         public void testClassWithTypeP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypeP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypePExtendsIterableP.kt")
         public void testClassWithTypePExtendsIterableP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypePP.kt")
         public void testClassWithTypePP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefNext.kt")
         public void testClassWithTypePRefNext() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefNext.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefSelf.kt")
         public void testClassWithTypePRefSelf() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelf.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassWithTypePRefSelfAndClass.kt")
         public void testClassWithTypePRefSelfAndClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("enum.kt")
         public void testEnum() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/enum.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldAsVar.kt")
         public void testFieldAsVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldAsVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldOfArrayType.kt")
         public void testFieldOfArrayType() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FieldOfArrayType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FinalFieldAsVal.kt")
         public void testFinalFieldAsVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/FinalFieldAsVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("genericFunction.kt")
         public void testGenericFunction() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/genericFunction.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritMethodsDifferentReturnTypes.kt")
         public void testInheritMethodsDifferentReturnTypes() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritMethodsDifferentReturnTypesGeneric.kt")
         public void testInheritMethodsDifferentReturnTypesGeneric() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InnerClass.kt")
         public void testInnerClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/InnerClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodTypePOneUpperBound.kt")
         public void testMethodTypePOneUpperBound() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePOneUpperBound.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodTypePTwoUpperBounds.kt")
         public void testMethodTypePTwoUpperBounds() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodWithTypeP.kt")
         public void testMethodWithTypeP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypeP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodWithTypePP.kt")
         public void testMethodWithTypePP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodWithTypePRefClassP.kt")
         public void testMethodWithTypePRefClassP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethodWithTypePRefClassP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MethosWithPRefTP.kt")
         public void testMethosWithPRefTP() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MethosWithPRefTP.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("MyException.kt")
         public void testMyException() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/MyException.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClass.kt")
         public void testNestedClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/NestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectInClass.kt")
         public void testObjectInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("objectMembers.kt")
         public void testObjectMembers() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/objectMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("packageLevelObject.kt")
         public void testPackageLevelObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/packageLevelObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("RemoveRedundantProjectionKind.kt")
         public void testRemoveRedundantProjectionKind() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/Simple.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TwoFields.kt")
         public void testTwoFields() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/TwoFields.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("UnboundWildcard.kt")
         public void testUnboundWildcard() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/UnboundWildcard.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
+        @TestDataPath("$PROJECT_ROOT")
         @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class})
         public static class KotlinSignature extends AbstractLazyResolveByStubTest {
             @TestMetadata("AllBoundsInWhen.kt")
             public void testAllBoundsInWhen() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInKotlinSignature() throws Exception {
@@ -1052,84 +1243,101 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ArrayType.kt")
             public void testArrayType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ArrayType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithNewTypeParams.kt")
             public void testConstructorWithNewTypeParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithParentTypeParams.kt")
             public void testConstructorWithParentTypeParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithSeveralParams.kt")
             public void testConstructorWithSeveralParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ConstructorWithoutParams.kt")
             public void testConstructorWithoutParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("CustomProjectionKind.kt")
             public void testCustomProjectionKind() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithFunctionTypes.kt")
             public void testMethodWithFunctionTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithGenerics.kt")
             public void testMethodWithGenerics() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithMappedClasses.kt")
             public void testMethodWithMappedClasses() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithTypeParameters.kt")
             public void testMethodWithTypeParameters() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("MethodWithVararg.kt")
             public void testMethodWithVararg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyArrayTypes.kt")
             public void testPropertyArrayTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertyComplexTypes.kt")
             public void testPropertyComplexTypes() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("PropertySimpleType.kt")
             public void testPropertySimpleType() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("StarProjection.kt")
             public void testStarProjection() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/StarProjection.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error")
+            @TestDataPath("$PROJECT_ROOT")
             public static class Error extends AbstractLazyResolveByStubTest {
                 @TestMetadata("AddingNullability.kt")
                 public void testAddingNullability() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.kt");
+                    doTest(fileName);
                 }
                 
                 public void testAllFilesPresentInError() throws Exception {
@@ -1138,137 +1346,164 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                 
                 @TestMetadata("ConflictingProjectionKind.kt")
                 public void testConflictingProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExplicitFieldGettersAndSetters.kt")
                 public void testExplicitFieldGettersAndSetters() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ExtraUpperBound.kt")
                 public void testExtraUpperBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("MissingUpperBound.kt")
                 public void testMissingUpperBound() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NoFieldTypeRef.kt")
                 public void testNoFieldTypeRef() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("NotVarargReplacedWithVararg.kt")
                 public void testNotVarargReplacedWithVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("RedundantProjectionKind.kt")
                 public void testRedundantProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("ReturnTypeMissing.kt")
                 public void testReturnTypeMissing() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("SyntaxError.kt")
                 public void testSyntaxError() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("SyntaxErrorInFieldAnnotation.kt")
                 public void testSyntaxErrorInFieldAnnotation() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("VarargReplacedWithNotVararg.kt")
                 public void testVarargReplacedWithNotVararg() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongFieldInitializer.kt")
                 public void testWrongFieldInitializer() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongFieldMutability.kt")
                 public void testWrongFieldMutability() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongFieldName.kt")
                 public void testWrongFieldName() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongMethodName.kt")
                 public void testWrongMethodName() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongProjectionKind.kt")
                 public void testWrongProjectionKind() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongReturnTypeStructure.kt")
                 public void testWrongReturnTypeStructure() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName1.kt")
                 public void testWrongTypeName1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName2.kt")
                 public void testWrongTypeName2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeName3.kt")
                 public void testWrongTypeName3() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure1.kt")
                 public void testWrongTypeParameterBoundStructure1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParameterBoundStructure2.kt")
                 public void testWrongTypeParameterBoundStructure2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongTypeParametersCount.kt")
                 public void testWrongTypeParametersCount() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongValueParameterStructure1.kt")
                 public void testWrongValueParameterStructure1() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongValueParameterStructure2.kt")
                 public void testWrongValueParameterStructure2() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("WrongValueParametersCount.kt")
                 public void testWrongValueParametersCount() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.kt");
+                    doTest(fileName);
                 }
                 
             }
             
             @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
+            @TestDataPath("$PROJECT_ROOT")
             @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class})
             public static class Propagation extends AbstractLazyResolveByStubTest {
                 public void testAllFilesPresentInPropagation() throws Exception {
@@ -1277,10 +1512,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                 
                 @TestMetadata("PropagateTypeArgumentNullable.kt")
                 public void testPropagateTypeArgumentNullable() throws Exception {
-                    doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                    String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/PropagateTypeArgumentNullable.kt");
+                    doTest(fileName);
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Parameter extends AbstractLazyResolveByStubTest {
                     public void testAllFilesPresentInParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1288,166 +1525,199 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                     
                     @TestMetadata("ChangeProjectionKind1.kt")
                     public void testChangeProjectionKind1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("ChangeProjectionKind2.kt")
                     public void testChangeProjectionKind2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter.kt")
                     public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                     public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/DeeplySubstitutedClassParameter2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritMutability.kt")
                     public void testInheritMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritMutability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNotVararg.kt")
                     public void testInheritNotVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargInteger.kt")
                     public void testInheritNotVarargInteger() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargNotNull.kt")
                     public void testInheritNotVarargNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargNotNull.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNotVarargPrimitive.kt")
                     public void testInheritNotVarargPrimitive() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullability.kt")
                     public void testInheritNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNullability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritProjectionKind.kt")
                     public void testInheritProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnliness.kt")
                     public void testInheritReadOnliness() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritReadOnliness.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritVararg.kt")
                     public void testInheritVararg() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVararg.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritVarargInteger.kt")
                     public void testInheritVarargInteger() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargInteger.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritVarargNotNull.kt")
                     public void testInheritVarargNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargNotNull.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritVarargPrimitive.kt")
                     public void testInheritVarargPrimitive() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritVarargPrimitive.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("Kt3302.kt")
                     public void testKt3302() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("MutableToReadOnly.kt")
                     public void testMutableToReadOnly() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/MutableToReadOnly.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("NotNullToNullable.kt")
                     public void testNotNullToNullable() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NotNullToNullable.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("NullableToNotNull.kt")
                     public void testNullableToNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("NullableToNotNullKotlinSignature.kt")
                     public void testNullableToNotNullKotlinSignature() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("OverrideWithErasedParameter.kt")
                     public void testOverrideWithErasedParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/OverrideWithErasedParameter.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("ReadOnlyToMutable.kt")
                     public void testReadOnlyToMutable() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubclassFromGenericAndNot.kt")
                     public void testSubclassFromGenericAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubclassFromGenericAndNot.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameter.kt")
                     public void testSubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameter.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameters.kt")
                     public void testSubstitutedClassParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/SubstitutedClassParameters.kt");
+                        doTest(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class Return extends AbstractLazyResolveByStubTest {
                     @TestMetadata("AddNotNullJavaSubtype.kt")
                     public void testAddNotNullJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("AddNotNullSameJavaType.kt")
                     public void testAddNotNullSameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("AddNullabilityJavaSubtype.kt")
                     public void testAddNullabilityJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameGenericType1.kt")
                     public void testAddNullabilitySameGenericType1() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameGenericType2.kt")
                     public void testAddNullabilitySameGenericType2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("AddNullabilitySameJavaType.kt")
                     public void testAddNullabilitySameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.kt");
+                        doTest(fileName);
                     }
                     
                     public void testAllFilesPresentInReturn() throws Exception {
@@ -1456,147 +1726,176 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                     
                     @TestMetadata("CantMakeImmutableInSubclass.kt")
                     public void testCantMakeImmutableInSubclass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter.kt")
                     public void testDeeplySubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("DeeplySubstitutedClassParameter2.kt")
                     public void testDeeplySubstitutedClassParameter2() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/DeeplySubstitutedClassParameter2.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("HalfSubstitutedTypeParameters.kt")
                     public void testHalfSubstitutedTypeParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/HalfSubstitutedTypeParameters.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilityGenericSubclassSimple.kt")
                     public void testInheritNullabilityGenericSubclassSimple() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityGenericSubclassSimple.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilityJavaSubtype.kt")
                     public void testInheritNullabilityJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilityJavaSubtype.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilitySameGenericType.kt")
                     public void testInheritNullabilitySameGenericType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameGenericType.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullabilitySameJavaType.kt")
                     public void testInheritNullabilitySameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritNullabilitySameJavaType.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritProjectionKind.kt")
                     public void testInheritProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessOfArgument.kt")
                     public void testInheritReadOnlinessOfArgument() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessOfArgument.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessSameClass.kt")
                     public void testInheritReadOnlinessSameClass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSameClass.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnlinessSubclass.kt")
                     public void testInheritReadOnlinessSubclass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/InheritReadOnlinessSubclass.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SameProjectionKind.kt")
                     public void testSameProjectionKind() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubclassFromGenericAndNot.kt")
                     public void testSubclassFromGenericAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubclassOfCollection.kt")
                     public void testSubclassOfCollection() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfCollection.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubclassOfMapEntry.kt")
                     public void testSubclassOfMapEntry() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassOfMapEntry.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameter.kt")
                     public void testSubstitutedClassParameter() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameter.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("SubstitutedClassParameters.kt")
                     public void testSubstitutedClassParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubstitutedClassParameters.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesConflictingProjectionKinds.kt")
                     public void testTwoSuperclassesConflictingProjectionKinds() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesInvariantAndCovariantInferMutability.kt")
                     public void testTwoSuperclassesInvariantAndCovariantInferMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferMutability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesInvariantAndCovariantInferNullability.kt")
                     public void testTwoSuperclassesInvariantAndCovariantInferNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesInvariantAndCovariantInferNullability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesMutableAndNot.kt")
                     public void testTwoSuperclassesMutableAndNot() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesMutableAndNot.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesReturnJavaSubtype.kt")
                     public void testTwoSuperclassesReturnJavaSubtype() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesReturnSameJavaType.kt")
                     public void testTwoSuperclassesReturnSameJavaType() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclassesSupplementNotNull.kt")
                     public void testTwoSuperclassesSupplementNotNull() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfClass.kt")
                     public void testTypeParamOfClass() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClass.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfClassSubstituted.kt")
                     public void testTypeParamOfClassSubstituted() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfClassSubstituted.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TypeParamOfFun.kt")
                     public void testTypeParamOfFun() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TypeParamOfFun.kt");
+                        doTest(fileName);
                     }
                     
                 }
                 
                 @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter")
+                @TestDataPath("$PROJECT_ROOT")
                 public static class TypeParameter extends AbstractLazyResolveByStubTest {
                     public void testAllFilesPresentInTypeParameter() throws Exception {
                         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1604,47 +1903,56 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
                     
                     @TestMetadata("InheritMutability.kt")
                     public void testInheritMutability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritMutability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritNullability.kt")
                     public void testInheritNullability() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritNullability.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("InheritReadOnliness.kt")
                     public void testInheritReadOnliness() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoBounds.kt")
                     public void testTwoBounds() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoBounds.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoSuperclasses.kt")
                     public void testTwoSuperclasses() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoSuperclasses.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("TwoTypeParameters.kt")
                     public void testTwoTypeParameters() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/TwoTypeParameters.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("UseParameterAsUpperBound.kt")
                     public void testUseParameterAsUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterAsUpperBound.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("UseParameterInUpperBound.kt")
                     public void testUseParameterInUpperBound() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBound.kt");
+                        doTest(fileName);
                     }
                     
                     @TestMetadata("UseParameterInUpperBoundWithKotlinSignature.kt")
                     public void testUseParameterInUpperBoundWithKotlinSignature() throws Exception {
-                        doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                        String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter/UseParameterInUpperBoundWithKotlinSignature.kt");
+                        doTest(fileName);
                     }
                     
                 }
@@ -1669,6 +1977,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Library extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1676,22 +1985,26 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("LoadIterable.kt")
             public void testLoadIterable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("LoadIterator.kt")
             public void testLoadIterator() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/LoadIterator.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("Max.kt")
             public void testMax() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library/Max.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Modality extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInModality() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1699,12 +2012,14 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ModalityOfFakeOverrides.kt")
             public void testModalityOfFakeOverrides() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NotNull extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInNotNull() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1712,27 +2027,32 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("NotNullField.kt")
             public void testNotNullField() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullField.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotNullIntArray.kt")
             public void testNotNullIntArray() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullIntArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotNullMethod.kt")
             public void testNotNullMethod() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullMethod.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotNullObjectArray.kt")
             public void testNotNullObjectArray() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullObjectArray.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NotNullParameter.kt")
             public void testNotNullParameter() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull/NotNullParameter.kt");
+                doTest(fileName);
             }
             
         }
@@ -1749,6 +2069,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class})
     public static class Fun extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInFun() throws Exception {
@@ -1757,55 +2078,66 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("Assert.kt")
         public void testAssert() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/Assert.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("DeclaredMemberOverridesDelegated.kt")
         public void testDeclaredMemberOverridesDelegated() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/DeclaredMemberOverridesDelegated.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritMethodsDifferentReturnTypesAndVisibilities.kt")
         public void testInheritMethodsDifferentReturnTypesAndVisibilities() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritMethodsDifferentReturnTypesAndVisibilities.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritValAndVar.kt")
         public void testInheritValAndVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValAndVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritValsDifferentTypes.kt")
         public void testInheritValsDifferentTypes() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/InheritValsDifferentTypes.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoDelegationForFunctionInheritedFromTraitSuperClass.kt")
         public void testNoDelegationForFunctionInheritedFromTraitSuperClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoDelegationForFunctionInheritedFromTraitSuperClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoSamAdapter.kt")
         public void testNoSamAdapter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamAdapter.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoSamConstructor.kt")
         public void testNoSamConstructor() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/NoSamConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropagateDeepSubclass.kt")
         public void testPropagateDeepSubclass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateDeepSubclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropagateSubclassOfComparable.kt")
         public void testPropagateSubclassOfComparable() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/PropagateSubclassOfComparable.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GenericWithTypeVariables extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInGenericWithTypeVariables() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1813,57 +2145,68 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("FunGenericParam.kt")
             public void testFunGenericParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunGenericParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamParam.kt")
             public void testFunParamParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamParamErased.kt")
             public void testFunParamParamErased() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamParamErased.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamReferencesParam.kt")
             public void testFunParamReferencesParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamReferencesParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamTwoUpperBounds.kt")
             public void testFunParamTwoUpperBounds() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamTwoUpperBounds.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamUpperClassBound.kt")
             public void testFunParamUpperClassBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamUpperClassInterfaceBound.kt")
             public void testFunParamUpperClassInterfaceBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperClassInterfaceBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamUpperInterfaceBound.kt")
             public void testFunParamUpperInterfaceBound() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamUpperInterfaceBound.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamVaragParam.kt")
             public void testFunParamVaragParam() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunParamVaragParam.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunTwoTypeParams.kt")
             public void testFunTwoTypeParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables/FunTwoTypeParams.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables")
+        @TestDataPath("$PROJECT_ROOT")
         public static class GenericWithoutTypeVariables extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1871,32 +2214,38 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("FunClassParamNotNull.kt")
             public void testFunClassParamNotNull() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunClassParamNullable.kt")
             public void testFunClassParamNullable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunClassParamNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamNullable.kt")
             public void testFunParamNullable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnTypeClassParamNotNull.kt")
             public void testReturnTypeClassParamNotNull() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnTypeClassParamNullable.kt")
             public void testReturnTypeClassParamNullable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables/ReturnTypeClassParamNullable.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric")
+        @TestDataPath("$PROJECT_ROOT")
         public static class NonGeneric extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInNonGeneric() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1904,87 +2253,104 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ClassFun.kt")
             public void testClassFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassFunGetFoo.kt")
             public void testClassFunGetFoo() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFoo.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassFunGetFooSetFoo.kt")
             public void testClassFunGetFooSetFoo() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassFunSetFoo.kt")
             public void testClassFunSetFoo() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ClassFunSetFoo.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtFun.kt")
             public void testExtFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtFunInClass.kt")
             public void testExtFunInClass() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ExtFunInClass.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunDefaultArg.kt")
             public void testFunDefaultArg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunDefaultArg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunParamNotNull.kt")
             public void testFunParamNotNull() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunParamNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunVarargInt.kt")
             public void testFunVarargInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("FunVarargInteger.kt")
             public void testFunVarargInteger() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/FunVarargInteger.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ModifierAbstract.kt")
             public void testModifierAbstract() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierAbstract.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ModifierOpen.kt")
             public void testModifierOpen() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ModifierOpen.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NsFun.kt")
             public void testNsFun() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFun.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("NsFunGetFoo.kt")
             public void testNsFunGetFoo() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/NsFunGetFoo.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnTypeNotNull.kt")
             public void testReturnTypeNotNull() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNotNull.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ReturnTypeNullable.kt")
             public void testReturnTypeNullable() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric/ReturnTypeNullable.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Vararg extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInVararg() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -1992,17 +2358,20 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("nonLastVararg.kt")
             public void testNonLastVararg() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/nonLastVararg.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VarargInt.kt")
             public void testVarargInt() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargInt.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("VarargString.kt")
             public void testVarargString() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg/VarargString.kt");
+                doTest(fileName);
             }
             
         }
@@ -2019,6 +2388,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Inline extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInInline() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2026,12 +2396,14 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("inlineFunction.kt")
         public void testInlineFunction() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/inline/inlineFunction.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Prop.DefaultAccessors.class})
     public static class Prop extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInProp() throws Exception {
@@ -2040,165 +2412,198 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("ClassVal.kt")
         public void testClassVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassValAbstract.kt")
         public void testClassValAbstract() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassValAbstract.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassVar.kt")
         public void testClassVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ClassVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("CollectionSize.kt")
         public void testCollectionSize() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/CollectionSize.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Constants.kt")
         public void testConstants() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/Constants.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValClass.kt")
         public void testExtValClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValInClass.kt")
         public void testExtValInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValInt.kt")
         public void testExtValInt() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValIntCharSequence.kt")
         public void testExtValIntCharSequence() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequence.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValIntCharSequenceQ.kt")
         public void testExtValIntCharSequenceQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntCharSequenceQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValIntListQOfIntInClass.kt")
         public void testExtValIntListQOfIntInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntListQOfIntInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValIntTInClass.kt")
         public void testExtValIntTInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValIntTQInClass.kt")
         public void testExtValIntTQInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValIntTQInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtValTIntInClass.kt")
         public void testExtValTIntInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtValTIntInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarClass.kt")
         public void testExtVarClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarInClass.kt")
         public void testExtVarInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarInt.kt")
         public void testExtVarInt() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarIntTInClass.kt")
         public void testExtVarIntTInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarIntTQInClass.kt")
         public void testExtVarIntTQInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarIntTQInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarMapPQInt.kt")
         public void testExtVarMapPQInt() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarMapPQInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarTIntInClass.kt")
         public void testExtVarTIntInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTIntInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarTQIntInClass.kt")
         public void testExtVarTQIntInClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarTQIntInClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtVarl.kt")
         public void testExtVarl() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/ExtVarl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NsVal.kt")
         public void testNsVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NsVar.kt")
         public void testNsVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/NsVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideClassVal.kt")
         public void testOverrideClassVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideClassVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideTraitVal.kt")
         public void testOverrideTraitVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/OverrideTraitVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropFromSuperclass.kt")
         public void testPropFromSuperclass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/PropFromSuperclass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitFinalVar.kt")
         public void testTraitFinalVar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitFinalVar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TraitOpenVal.kt")
         public void testTraitOpenVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/TraitOpenVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarDelegationToTraitImpl.kt")
         public void testVarDelegationToTraitImpl() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarDelegationToTraitImpl.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("VarWithDelegated.kt")
         public void testVarWithDelegated() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/VarWithDelegated.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors")
+        @TestDataPath("$PROJECT_ROOT")
         public static class DefaultAccessors extends AbstractLazyResolveByStubTest {
             public void testAllFilesPresentInDefaultAccessors() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2206,52 +2611,62 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
             
             @TestMetadata("ClassVal.kt")
             public void testClassVal() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVal.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassValParams.kt")
             public void testClassValParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassValWithGet.kt")
             public void testClassValWithGet() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassValWithGet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVar.kt")
             public void testClassVar() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVar.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVarModality.kt")
             public void testClassVarModality() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarModality.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVarParams.kt")
             public void testClassVarParams() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarParams.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVarWithGet.kt")
             public void testClassVarWithGet() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithGet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ClassVarWithSet.kt")
             public void testClassVarWithSet() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ClassVarWithSet.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtValLong.kt")
             public void testExtValLong() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtValLong.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("ExtVarLong.kt")
             public void testExtVarLong() throws Exception {
-                doTest("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors/ExtVarLong.kt");
+                doTest(fileName);
             }
             
         }
@@ -2265,6 +2680,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/type")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Type extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2272,152 +2688,182 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("Any.kt")
         public void testAny() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Any.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("AnyQ.kt")
         public void testAnyQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/AnyQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfInNumber.kt")
         public void testArrayOfInNumber() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInNumber.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfInt.kt")
         public void testArrayOfInt() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInt.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfInteger.kt")
         public void testArrayOfInteger() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfInteger.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfOutNumber.kt")
         public void testArrayOfOutNumber() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutNumber.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfOutT.kt")
         public void testArrayOfOutT() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfOutT.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ArrayOfString.kt")
         public void testArrayOfString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ArrayOfString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Function1IntString.kt")
         public void testFunction1IntString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Function1IntString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Int.kt")
         public void testInt() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Int.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntArray.kt")
         public void testIntArray() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntArray.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("IntQ.kt")
         public void testIntQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/IntQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlInteger.kt")
         public void testJlInteger() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlInteger.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlIntegerQ.kt")
         public void testJlIntegerQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlIntegerQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlNumber.kt")
         public void testJlNumber() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlNumber.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlObject.kt")
         public void testJlObject() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObject.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlObjectQ.kt")
         public void testJlObjectQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlObjectQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlString.kt")
         public void testJlString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("jlStringQ.kt")
         public void testJlStringQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/jlStringQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfAny.kt")
         public void testListOfAny() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAny.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfAnyQ.kt")
         public void testListOfAnyQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfAnyQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfStar.kt")
         public void testListOfStar() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfStar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfString.kt")
         public void testListOfString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ListOfjlString.kt")
         public void testListOfjlString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/ListOfjlString.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Nothing.kt")
         public void testNothing() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Nothing.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NothingQ.kt")
         public void testNothingQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/NothingQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("String.kt")
         public void testString() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/String.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("StringQ.kt")
         public void testStringQ() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/StringQ.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("Unit.kt")
         public void testUnit() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/type/Unit.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Visibility extends AbstractLazyResolveByStubTest {
         public void testAllFilesPresentInVisibility() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -2425,67 +2871,80 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes
         
         @TestMetadata("InternalAbstractTraitMembersOverridden.kt")
         public void testInternalAbstractTraitMembersOverridden() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalAbstractTraitMembersOverridden.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InternalClass.kt")
         public void testInternalClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InternalConstructor.kt")
         public void testInternalConstructor() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InternalTopLevelMembers.kt")
         public void testInternalTopLevelMembers() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTopLevelMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InternalTraitMembers.kt")
         public void testInternalTraitMembers() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("InternalTraitMembersInherited.kt")
         public void testInternalTraitMembersInherited() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/InternalTraitMembersInherited.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateClass.kt")
         public void testPrivateClass() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateClassMembers.kt")
         public void testPrivateClassMembers() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateClassMembers.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateTopLevelFun.kt")
         public void testPrivateTopLevelFun() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelFun.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateTopLevelVal.kt")
         public void testPrivateTopLevelVal() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PrivateTopLevelVal.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyInConstructor.kt")
         public void testPropertyInConstructor() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("PropertyInConstructorExplicitVisibility.kt")
         public void testPropertyInConstructorExplicitVisibility() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/PropertyInConstructorExplicitVisibility.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TopLevelVarWithPrivateSetter.kt")
         public void testTopLevelVarWithPrivateSetter() throws Exception {
-            doTest("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+            String fileName = JetTestUtils.navigationMetadata("compiler/testData/loadJava/compiledKotlin/visibility/TopLevelVarWithPrivateSetter.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java
index e2d32692206..80b5063aa71 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.stubs;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/multiFileHighlighting")
+@TestDataPath("$PROJECT_ROOT")
 public class MultiFileHighlightingTestGenerated extends AbstractMultiFileHighlightingTest {
     public void testAllFilesPresentInMultiFileHighlighting() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiFileHighlighting"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -35,22 +37,26 @@ public class MultiFileHighlightingTestGenerated extends AbstractMultiFileHighlig
     
     @TestMetadata("delegatesReference.kt")
     public void testDelegatesReference() throws Exception {
-        doTest("idea/testData/multiFileHighlighting/delegatesReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/delegatesReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("enumReference.kt")
     public void testEnumReference() throws Exception {
-        doTest("idea/testData/multiFileHighlighting/enumReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/enumReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("referencesFunWithUnspecifiedType.kt")
     public void testReferencesFunWithUnspecifiedType() throws Exception {
-        doTest("idea/testData/multiFileHighlighting/referencesFunWithUnspecifiedType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/referencesFunWithUnspecifiedType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("topLevelMembersReference.kt")
     public void testTopLevelMembersReference() throws Exception {
-        doTest("idea/testData/multiFileHighlighting/topLevelMembersReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/multiFileHighlighting/topLevelMembersReference.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java
index 8f43fe54ea4..b4c4a5650d9 100644
--- a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.plugin.stubs;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/stubs")
+@TestDataPath("$PROJECT_ROOT")
 public class StubBuilderTestGenerated extends AbstractStubBuilderTest {
     public void testAllFilesPresentInStubs() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/stubs"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,147 +37,176 @@ public class StubBuilderTestGenerated extends AbstractStubBuilderTest {
     
     @TestMetadata("AnnotationClass.kt")
     public void testAnnotationClass() throws Exception {
-        doTest("idea/testData/stubs/AnnotationClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationOnClass.kt")
     public void testAnnotationOnClass() throws Exception {
-        doTest("idea/testData/stubs/AnnotationOnClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationOnFunction.kt")
     public void testAnnotationOnFunction() throws Exception {
-        doTest("idea/testData/stubs/AnnotationOnFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationOnLocalFunction.kt")
     public void testAnnotationOnLocalFunction() throws Exception {
-        doTest("idea/testData/stubs/AnnotationOnLocalFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnnotationOnLocalFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnonymousObject.kt")
     public void testAnonymousObject() throws Exception {
-        doTest("idea/testData/stubs/AnonymousObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/AnonymousObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassObject.kt")
     public void testClassObject() throws Exception {
-        doTest("idea/testData/stubs/ClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassProperty.kt")
     public void testClassProperty() throws Exception {
-        doTest("idea/testData/stubs/ClassProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassTypeParameters.kt")
     public void testClassTypeParameters() throws Exception {
-        doTest("idea/testData/stubs/ClassTypeParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ClassTypeParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FilePackage.kt")
     public void testFilePackage() throws Exception {
-        doTest("idea/testData/stubs/FilePackage.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FilePackage.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionInNotNamedObject.kt")
     public void testFunctionInNotNamedObject() throws Exception {
-        doTest("idea/testData/stubs/FunctionInNotNamedObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FunctionInNotNamedObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FunctionParameters.kt")
     public void testFunctionParameters() throws Exception {
-        doTest("idea/testData/stubs/FunctionParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/FunctionParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InnerClass.kt")
     public void testInnerClass() throws Exception {
-        doTest("idea/testData/stubs/InnerClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/InnerClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalClass.kt")
     public void testLocalClass() throws Exception {
-        doTest("idea/testData/stubs/LocalClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalClassInLocalFunction.kt")
     public void testLocalClassInLocalFunction() throws Exception {
-        doTest("idea/testData/stubs/LocalClassInLocalFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalClassInLocalFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("LocalNamedObject.kt")
     public void testLocalNamedObject() throws Exception {
-        doTest("idea/testData/stubs/LocalNamedObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/LocalNamedObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ManyAnnotationsOnFunction.kt")
     public void testManyAnnotationsOnFunction() throws Exception {
-        doTest("idea/testData/stubs/ManyAnnotationsOnFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ManyAnnotationsOnFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MembersInLocalClass.kt")
     public void testMembersInLocalClass() throws Exception {
-        doTest("idea/testData/stubs/MembersInLocalClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MembersInLocalObject.kt")
     public void testMembersInLocalObject() throws Exception {
-        doTest("idea/testData/stubs/MembersInLocalObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/MembersInLocalObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NamedObject.kt")
     public void testNamedObject() throws Exception {
-        doTest("idea/testData/stubs/NamedObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NamedObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotStorePropertiesFrom.kt")
     public void testNotStorePropertiesFrom() throws Exception {
-        doTest("idea/testData/stubs/NotStorePropertiesFrom.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertiesFrom.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotStorePropertyFromDelegate.kt")
     public void testNotStorePropertyFromDelegate() throws Exception {
-        doTest("idea/testData/stubs/NotStorePropertyFromDelegate.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromDelegate.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("NotStorePropertyFromInitializer.kt")
     public void testNotStorePropertyFromInitializer() throws Exception {
-        doTest("idea/testData/stubs/NotStorePropertyFromInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/NotStorePropertyFromInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectInInitializer.kt")
     public void testObjectInInitializer() throws Exception {
-        doTest("idea/testData/stubs/ObjectInInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ObjectInInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ObjectInPropertyDelegate.kt")
     public void testObjectInPropertyDelegate() throws Exception {
-        doTest("idea/testData/stubs/ObjectInPropertyDelegate.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ObjectInPropertyDelegate.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PackageProperty.kt")
     public void testPackageProperty() throws Exception {
-        doTest("idea/testData/stubs/PackageProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/PackageProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ParametersWithFqName.kt")
     public void testParametersWithFqName() throws Exception {
-        doTest("idea/testData/stubs/ParametersWithFqName.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/ParametersWithFqName.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyAsPropertyInitalizerInvalidCode.kt")
     public void testPropertyAsPropertyInitalizerInvalidCode() throws Exception {
-        doTest("idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/PropertyAsPropertyInitalizerInvalidCode.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("QualifiedAnnotationOnFunction.kt")
     public void testQualifiedAnnotationOnFunction() throws Exception {
-        doTest("idea/testData/stubs/QualifiedAnnotationOnFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/QualifiedAnnotationOnFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SimpleEnumBuild.kt")
     public void testSimpleEnumBuild() throws Exception {
-        doTest("idea/testData/stubs/SimpleEnumBuild.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/stubs/SimpleEnumBuild.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java
index 35ea8405ce6..1f7797beb9f 100644
--- a/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.psi;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetPsiMatcherTestGenerated.Expressions.class, JetPsiMatcherTestGenerated.Types.class})
 public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
     @TestMetadata("idea/testData/jetPsiMatcher/expressions")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({Expressions.ArrayAccess.class, Expressions.BinaryExpr.class, Expressions.Call.class, Expressions.Const.class, Expressions.Misc.class, Expressions.SimpleName.class, Expressions.Super.class, Expressions.Throw.class, Expressions.UnaryExpr.class})
     public static class Expressions extends AbstractJetPsiMatcherTest {
         public void testAllFilesPresentInExpressions() throws Exception {
@@ -37,6 +39,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess")
+        @TestDataPath("$PROJECT_ROOT")
         public static class ArrayAccess extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInArrayAccess() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -44,32 +47,38 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("arrayAccess1.kt")
             public void testArrayAccess1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("arrayAccess2.kt")
             public void testArrayAccess2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess/arrayAccess2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_arrayAccess1.kt")
             public void test_arrayAccess1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_arrayAccess2.kt")
             public void test_arrayAccess2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_arrayAccess3.kt")
             public void test_arrayAccess3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess/_arrayAccess3.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr")
+        @TestDataPath("$PROJECT_ROOT")
         public static class BinaryExpr extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInBinaryExpr() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/binaryExpr"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -77,62 +86,74 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("binaryExpr1.kt")
             public void testBinaryExpr1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("binaryExpr2.kt")
             public void testBinaryExpr2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("binaryExpr3.kt")
             public void testBinaryExpr3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("binaryExpr4.kt")
             public void testBinaryExpr4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr4.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("binaryExpr5.kt")
             public void testBinaryExpr5() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/binaryExpr5.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr1.kt")
             public void test_binaryExpr1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr2.kt")
             public void test_binaryExpr2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr3.kt")
             public void test_binaryExpr3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr4.kt")
             public void test_binaryExpr4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr4.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr5.kt")
             public void test_binaryExpr5() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr5.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_binaryExpr6.kt")
             public void test_binaryExpr6() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr/_binaryExpr6.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/call")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Call extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInCall() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/call"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -140,47 +161,56 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("call1.kt")
             public void testCall1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/call1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("call2.kt")
             public void testCall2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/call2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("call3.kt")
             public void testCall3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/call3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("call4.kt")
             public void testCall4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/call4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/call4.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_call1.kt")
             public void test_call1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/_call1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_call2.kt")
             public void test_call2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/_call2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_call3.kt")
             public void test_call3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/_call3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_call4.kt")
             public void test_call4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/call/_call4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/call/_call4.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/const")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Const extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInConst() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/const"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -188,17 +218,20 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("const.kt")
             public void testConst() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/const/const.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/const/const.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_const.kt")
             public void test_const() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/const/_const.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/const/_const.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/misc")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Misc extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInMisc() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -206,37 +239,44 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("misc1.kt")
             public void testMisc1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/misc1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("misc2.kt")
             public void testMisc2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/misc2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("misc3.kt")
             public void testMisc3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/misc3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/misc3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_misc1.kt")
             public void test_misc1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/_misc1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_misc2.kt")
             public void test_misc2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/_misc2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_misc3.kt")
             public void test_misc3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/misc/_misc3.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/simpleName")
+        @TestDataPath("$PROJECT_ROOT")
         public static class SimpleName extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInSimpleName() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/simpleName"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -244,22 +284,26 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("simpleName.kt")
             public void testSimpleName() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/simpleName/simpleName.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("simpleName2.kt")
             public void testSimpleName2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/simpleName/simpleName2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/simpleName/simpleName2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_simpleName.kt")
             public void test_simpleName() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/simpleName/_simpleName.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/super")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Super extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInSuper() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -267,47 +311,56 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("super1.kt")
             public void testSuper1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/super1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("super2.kt")
             public void testSuper2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/super2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("super3.kt")
             public void testSuper3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/super3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("super4.kt")
             public void testSuper4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/super4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/super4.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_super1.kt")
             public void test_super1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/_super1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_super2.kt")
             public void test_super2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/_super2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_super3.kt")
             public void test_super3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/_super3.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_super4.kt")
             public void test_super4() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/super/_super4.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/super/_super4.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/throw")
+        @TestDataPath("$PROJECT_ROOT")
         public static class Throw extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInThrow() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/throw"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -315,17 +368,20 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("throw.kt")
             public void testThrow() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/throw/throw.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/throw/throw.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_throw.kt")
             public void test_throw() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/throw/_throw.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/throw/_throw.kt");
+                doTestExpressions(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr")
+        @TestDataPath("$PROJECT_ROOT")
         public static class UnaryExpr extends AbstractJetPsiMatcherTest {
             public void testAllFilesPresentInUnaryExpr() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/unaryExpr"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -333,27 +389,32 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
             
             @TestMetadata("unaryExpr1.kt")
             public void testUnaryExpr1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("unaryExpr2.kt")
             public void testUnaryExpr2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr/unaryExpr2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_unaryExpr1.kt")
             public void test_unaryExpr1() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr1.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_unaryExpr2.kt")
             public void test_unaryExpr2() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr2.kt");
+                doTestExpressions(fileName);
             }
             
             @TestMetadata("_unaryExpr3.kt")
             public void test_unaryExpr3() throws Exception {
-                doTestExpressions("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr/_unaryExpr3.kt");
+                doTestExpressions(fileName);
             }
             
         }
@@ -375,6 +436,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
     }
     
     @TestMetadata("idea/testData/jetPsiMatcher/types")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Types extends AbstractJetPsiMatcherTest {
         public void testAllFilesPresentInTypes() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/types"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -382,57 +444,68 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest {
         
         @TestMetadata("functional1.kt")
         public void testFunctional1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/functional1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/functional1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("functional2.kt")
         public void testFunctional2() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/functional2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/functional2.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("functional3.kt")
         public void testFunctional3() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/functional3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/functional3.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("nullable1.kt")
         public void testNullable1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/nullable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/nullable1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("user1.kt")
         public void testUser1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/user1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/user1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("user2.kt")
         public void testUser2() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/user2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/user2.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("_functional1.kt")
         public void test_functional1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/_functional1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/_functional1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("_functional2.kt")
         public void test_functional2() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/_functional2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/_functional2.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("_nullable1.kt")
         public void test_nullable1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/_nullable1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/_nullable1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("_user1.kt")
         public void test_user1() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/_user1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/_user1.kt");
+            doTestTypes(fileName);
         }
         
         @TestMetadata("_user2.kt")
         public void test_user2() throws Exception {
-            doTestTypes("idea/testData/jetPsiMatcher/types/_user2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/jetPsiMatcher/types/_user2.kt");
+            doTestTypes(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java
index 1a240aa115c..5d2614ec589 100644
--- a/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/additionalLazyResolve")
+@TestDataPath("$PROJECT_ROOT")
 public class AdditionalLazyResolveDescriptorRendererTestGenerated extends AbstractAdditionalLazyResolveDescriptorRendererTest {
     public void testAllFilesPresentInAdditionalLazyResolve() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/additionalLazyResolve"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -35,32 +37,38 @@ public class AdditionalLazyResolveDescriptorRendererTestGenerated extends Abstra
     
     @TestMetadata("anonymousObjectInClassInitializer.kt")
     public void testAnonymousObjectInClassInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("anonymousObjectInClassParameterInitializer.kt")
     public void testAnonymousObjectInClassParameterInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/anonymousObjectInClassParameterInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localClassInClassInitializer.kt")
     public void testLocalClassInClassInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/localClassInClassInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localClassInClosureInClassParameterInitializer.kt")
     public void testLocalClassInClosureInClassParameterInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/localClassInClosureInClassParameterInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localObjectInClassInitializer.kt")
     public void testLocalObjectInClassInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/localObjectInClassInitializer.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("localObjectInClosureInClassParameterInitializer.kt")
     public void testLocalObjectInClosureInClassParameterInitializer() throws Exception {
-        doTest("idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/additionalLazyResolve/localObjectInClosureInClassParameterInitializer.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java
index a035f3da3ca..76a0d7184d5 100644
--- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceInLib")
+@TestDataPath("$PROJECT_ROOT")
 public class ReferenceResolveInLibrarySourcesTestGenerated extends AbstractReferenceResolveInLibrarySourcesTest {
     public void testAllFilesPresentInReferenceInLib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInLib"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -35,12 +37,14 @@ public class ReferenceResolveInLibrarySourcesTestGenerated extends AbstractRefer
     
     @TestMetadata("builtInNumber.kt")
     public void testBuiltInNumber() throws Exception {
-        doTest("idea/testData/resolve/referenceInLib/builtInNumber.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/builtInNumber.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("inLibrarySource.kt")
     public void testInLibrarySource() throws Exception {
-        doTest("idea/testData/resolve/referenceInLib/inLibrarySource.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceInLib/inLibrarySource.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java
index 82c1bdc134b..55690cce833 100644
--- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/references")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ReferenceResolveTestGenerated.DelegatedPropertyAccessors.class, ReferenceResolveTestGenerated.ForLoopIn.class, ReferenceResolveTestGenerated.Invoke.class})
 public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest {
     public void testAllFilesPresentInReferences() throws Exception {
@@ -36,195 +38,234 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
     
     @TestMetadata("AnnotationForClass.kt")
     public void testAnnotationForClass() throws Exception {
-        doTest("idea/testData/resolve/references/AnnotationForClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationForClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationInsideFunction.kt")
     public void testAnnotationInsideFunction() throws Exception {
-        doTest("idea/testData/resolve/references/AnnotationInsideFunction.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationInsideFunction.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationParameter.kt")
     public void testAnnotationParameter() throws Exception {
-        doTest("idea/testData/resolve/references/AnnotationParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("AnnotationTypeParameter.kt")
     public void testAnnotationTypeParameter() throws Exception {
-        doTest("idea/testData/resolve/references/AnnotationTypeParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/AnnotationTypeParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassInTypeConstraint.kt")
     public void testClassInTypeConstraint() throws Exception {
-        doTest("idea/testData/resolve/references/ClassInTypeConstraint.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassInTypeConstraint.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ClassReferenceInImport.kt")
     public void testClassReferenceInImport() throws Exception {
-        doTest("idea/testData/resolve/references/ClassReferenceInImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ClassReferenceInImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("CtrlClickResolve.kt")
     public void testCtrlClickResolve() throws Exception {
-        doTest("idea/testData/resolve/references/CtrlClickResolve.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/CtrlClickResolve.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("DontImportRootScope.kt")
     public void testDontImportRootScope() throws Exception {
-        doTest("idea/testData/resolve/references/DontImportRootScope.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/DontImportRootScope.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeJavaLang1.kt")
     public void testFakeJavaLang1() throws Exception {
-        doTest("idea/testData/resolve/references/FakeJavaLang1.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang1.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeJavaLang2.kt")
     public void testFakeJavaLang2() throws Exception {
-        doTest("idea/testData/resolve/references/FakeJavaLang2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeJavaLang3.kt")
     public void testFakeJavaLang3() throws Exception {
-        doTest("idea/testData/resolve/references/FakeJavaLang3.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang3.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("FakeJavaLang4.kt")
     public void testFakeJavaLang4() throws Exception {
-        doTest("idea/testData/resolve/references/FakeJavaLang4.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/FakeJavaLang4.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GenericFunctionParameter.kt")
     public void testGenericFunctionParameter() throws Exception {
-        doTest("idea/testData/resolve/references/GenericFunctionParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/GenericFunctionParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("GenericTypeInFunctionParameter.kt")
     public void testGenericTypeInFunctionParameter() throws Exception {
-        doTest("idea/testData/resolve/references/GenericTypeInFunctionParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/GenericTypeInFunctionParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassParameter.kt")
     public void testInClassParameter() throws Exception {
-        doTest("idea/testData/resolve/references/InClassParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InClassParameterField.kt")
     public void testInClassParameterField() throws Exception {
-        doTest("idea/testData/resolve/references/InClassParameterField.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InClassParameterField.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InFunctionParameterType.kt")
     public void testInFunctionParameterType() throws Exception {
-        doTest("idea/testData/resolve/references/InFunctionParameterType.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InFunctionParameterType.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InMethodParameter.kt")
     public void testInMethodParameter() throws Exception {
-        doTest("idea/testData/resolve/references/InMethodParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InMethodParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InObjectClassObject.kt")
     public void testInObjectClassObject() throws Exception {
-        doTest("idea/testData/resolve/references/InObjectClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InObjectClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("InSecondClassObject.kt")
     public void testInSecondClassObject() throws Exception {
-        doTest("idea/testData/resolve/references/InSecondClassObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/InSecondClassObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaAnnotationParameter.kt")
     public void testJavaAnnotationParameter() throws Exception {
-        doTest("idea/testData/resolve/references/JavaAnnotationParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaAnnotationParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaEnumEntry.kt")
     public void testJavaEnumEntry() throws Exception {
-        doTest("idea/testData/resolve/references/JavaEnumEntry.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaEnumEntry.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaParameter.kt")
     public void testJavaParameter() throws Exception {
-        doTest("idea/testData/resolve/references/JavaParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaReference.kt")
     public void testJavaReference() throws Exception {
-        doTest("idea/testData/resolve/references/JavaReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/JavaReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MultiDeclarationExtension.kt")
     public void testMultiDeclarationExtension() throws Exception {
-        doTest("idea/testData/resolve/references/MultiDeclarationExtension.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationExtension.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("MultiDeclarationMember.kt")
     public void testMultiDeclarationMember() throws Exception {
-        doTest("idea/testData/resolve/references/MultiDeclarationMember.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/MultiDeclarationMember.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PackageReference.kt")
     public void testPackageReference() throws Exception {
-        doTest("idea/testData/resolve/references/PackageReference.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReference.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PackageReferenceInImport.kt")
     public void testPackageReferenceInImport() throws Exception {
-        doTest("idea/testData/resolve/references/PackageReferenceInImport.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PackageReferenceInImport.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("PropertyPlaceInClassObjectInObject.kt")
     public void testPropertyPlaceInClassObjectInObject() throws Exception {
-        doTest("idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/PropertyPlaceInClassObjectInObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ReferenceInClassWhereConstraint.kt")
     public void testReferenceInClassWhereConstraint() throws Exception {
-        doTest("idea/testData/resolve/references/ReferenceInClassWhereConstraint.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInClassWhereConstraint.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ReferenceInFunWhereConstraint.kt")
     public void testReferenceInFunWhereConstraint() throws Exception {
-        doTest("idea/testData/resolve/references/ReferenceInFunWhereConstraint.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ReferenceInFunWhereConstraint.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolveClass.kt")
     public void testResolveClass() throws Exception {
-        doTest("idea/testData/resolve/references/ResolveClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ResolveClass.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("ResolvePackageInProperty.kt")
     public void testResolvePackageInProperty() throws Exception {
-        doTest("idea/testData/resolve/references/ResolvePackageInProperty.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/ResolvePackageInProperty.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SamAdapter.kt")
     public void testSamAdapter() throws Exception {
-        doTest("idea/testData/resolve/references/SamAdapter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamAdapter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SamConstructor.kt")
     public void testSamConstructor() throws Exception {
-        doTest("idea/testData/resolve/references/SamConstructor.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructor.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SamConstructorTypeArguments.kt")
     public void testSamConstructorTypeArguments() throws Exception {
-        doTest("idea/testData/resolve/references/SamConstructorTypeArguments.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SamConstructorTypeArguments.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SeveralOverrides.kt")
     public void testSeveralOverrides() throws Exception {
-        doTest("idea/testData/resolve/references/SeveralOverrides.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/SeveralOverrides.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("TypeParameterInFunctionLiteral.kt")
     public void testTypeParameterInFunctionLiteral() throws Exception {
-        doTest("idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/TypeParameterInFunctionLiteral.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({DelegatedPropertyAccessors.InSource.class, DelegatedPropertyAccessors.InStandardLibrary.class})
     public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception {
@@ -233,10 +274,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("unresolved.kt")
         public void testUnresolved() throws Exception {
-            doTest("idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/unresolved.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource")
+        @TestDataPath("$PROJECT_ROOT")
         public static class InSource extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInSource() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -244,37 +287,44 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
             @TestMetadata("getExtension.kt")
             public void testGetExtension() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getMember.kt")
             public void testGetMember() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMember.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getMultipleDeclarations.kt")
             public void testGetMultipleDeclarations() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getMultipleDeclarations.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getOneFakeOverride.kt")
             public void testGetOneFakeOverride() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getOneFakeOverride.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getSetExtension.kt")
             public void testGetSetExtension() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetExtension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetExtension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("getSetMember.kt")
             public void testGetSetMember() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetMember.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource/getSetMember.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary")
+        @TestDataPath("$PROJECT_ROOT")
         public static class InStandardLibrary extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInStandardLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -282,12 +332,14 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
             @TestMetadata("lazy.kt")
             public void testLazy() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/lazy.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("notNull.kt")
             public void testNotNull() throws Exception {
-                doTest("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary/notNull.kt");
+                doTest(fileName);
             }
             
         }
@@ -302,6 +354,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
     }
     
     @TestMetadata("idea/testData/resolve/references/forLoopIn")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({ForLoopIn.InBuiltIns.class, ForLoopIn.InLibrary.class, ForLoopIn.InSource.class})
     public static class ForLoopIn extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInForLoopIn() throws Exception {
@@ -310,10 +363,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("unresolvedIterator.kt")
         public void testUnresolvedIterator() throws Exception {
-            doTest("idea/testData/resolve/references/forLoopIn/unresolvedIterator.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/unresolvedIterator.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns")
+        @TestDataPath("$PROJECT_ROOT")
         public static class InBuiltIns extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInBuiltIns() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -321,17 +376,20 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
             @TestMetadata("extension.kt")
             public void testExtension() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/extension.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("member.kt")
             public void testMember() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns/member.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inLibrary")
+        @TestDataPath("$PROJECT_ROOT")
         public static class InLibrary extends AbstractReferenceResolveTest {
             public void testAllFilesPresentInInLibrary() throws Exception {
                 JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -339,16 +397,19 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
             @TestMetadata("extension.kt")
             public void testExtension() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inLibrary/extension.kt");
+                doTest(fileName);
             }
             
         }
         
         @TestMetadata("idea/testData/resolve/references/forLoopIn/inSource")
+        @TestDataPath("$PROJECT_ROOT")
         public static class InSource extends AbstractReferenceResolveTest {
             @TestMetadata("allExtensions.kt")
             public void testAllExtensions() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allExtensions.kt");
+                doTest(fileName);
             }
             
             public void testAllFilesPresentInInSource() throws Exception {
@@ -357,12 +418,14 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
             
             @TestMetadata("allMembers.kt")
             public void testAllMembers() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/allMembers.kt");
+                doTest(fileName);
             }
             
             @TestMetadata("nextMissing.kt")
             public void testNextMissing() throws Exception {
-                doTest("idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt");
+                String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/forLoopIn/inSource/nextMissing.kt");
+                doTest(fileName);
             }
             
         }
@@ -378,6 +441,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
     }
     
     @TestMetadata("idea/testData/resolve/references/invoke")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Invoke extends AbstractReferenceResolveTest {
         public void testAllFilesPresentInInvoke() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/invoke"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -385,47 +449,56 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
         
         @TestMetadata("lambdaAndParens.kt")
         public void testLambdaAndParens() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/lambdaAndParens.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaAndParens.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaNoPar.kt")
         public void testLambdaNoPar() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/lambdaNoPar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoPar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaNoParLabel.kt")
         public void testLambdaNoParLabel() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/lambdaNoParLabel.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParLabel.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("lambdaNoParRCurly.kt")
         public void testLambdaNoParRCurly() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/lambdaNoParRCurly.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noParams.kt")
         public void testNoParams() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/noParams.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParams.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("noParamsRPar.kt")
         public void testNoParamsRPar() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/noParamsRPar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/noParamsRPar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("nonemptyLambdaRPar.kt")
         public void testNonemptyLambdaRPar() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/nonemptyLambdaRPar.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("oneParam.kt")
         public void testOneParam() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/oneParam.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParam.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("oneParamRPar.kt")
         public void testOneParamRPar() throws Exception {
-            doTest("idea/testData/resolve/references/invoke/oneParamRPar.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/references/invoke/oneParamRPar.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java
index f98fac8a006..85f648c645d 100644
--- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceWithLib")
+@TestDataPath("$PROJECT_ROOT")
 public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResolveWithLibTest {
     public void testAllFilesPresentInReferenceWithLib() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -35,57 +37,68 @@ public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResol
     
     @TestMetadata("delegatedPropertyWithTypeParameters.kt")
     public void testDelegatedPropertyWithTypeParameters() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/delegatedPropertyWithTypeParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("fakeOverride.kt")
     public void testFakeOverride() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/fakeOverride.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("fakeOverride2.kt")
     public void testFakeOverride2() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/fakeOverride2.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/fakeOverride2.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("innerClassFromLib.kt")
     public void testInnerClassFromLib() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/innerClassFromLib.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/innerClassFromLib.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("iteratorWithTypeParameter.kt")
     public void testIteratorWithTypeParameter() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/iteratorWithTypeParameter.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/iteratorWithTypeParameter.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("multiDeclarationWithTypeParameters.kt")
     public void testMultiDeclarationWithTypeParameters() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/multiDeclarationWithTypeParameters.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("nestedClassFromLib.kt")
     public void testNestedClassFromLib() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/nestedClassFromLib.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("packageOfLibDeclaration.kt")
     public void testPackageOfLibDeclaration() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/packageOfLibDeclaration.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/packageOfLibDeclaration.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("referenceToRootJavaClassFromLib.kt")
     public void testReferenceToRootJavaClassFromLib() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/referenceToRootJavaClassFromLib.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/referenceToRootJavaClassFromLib.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("sameNameInLib.kt")
     public void testSameNameInLib() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/sameNameInLib.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/sameNameInLib.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("setWithTypeParameters.kt")
     public void testSetWithTypeParameters() throws Exception {
-        doTest("idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceWithLib/setWithTypeParameters.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java
index 2e20c24779c..9345bb962c0 100644
--- a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.resolve;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure")
+@TestDataPath("$PROJECT_ROOT")
 public class ReferenceToJavaWithWrongFileStructureTestGenerated extends AbstractReferenceToJavaWithWrongFileStructureTest {
     public void testAllFilesPresentInReferenceToJavaWithWrongFileStructure() throws Exception {
         JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceToJavaWithWrongFileStructure"), Pattern.compile("^(.+)\\.kt$"), false);
@@ -35,12 +37,14 @@ public class ReferenceToJavaWithWrongFileStructureTestGenerated extends Abstract
     
     @TestMetadata("ClassStatics.kt")
     public void testClassStatics() throws Exception {
-        doTest("idea/testData/resolve/referenceToJavaWithWrongFileStructure/ClassStatics.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/ClassStatics.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("SimpleClass.kt")
     public void testSimpleClass() throws Exception {
-        doTest("idea/testData/resolve/referenceToJavaWithWrongFileStructure/SimpleClass.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure/SimpleClass.kt");
+        doTest(fileName);
     }
     
 }
diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
index adf3d76d254..0d92248d132 100644
--- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.safeDelete;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -30,6 +31,7 @@ import java.util.regex.Pattern;
 @InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class, JetSafeDeleteTestGenerated.KotlinValueParameter.class, JetSafeDeleteTestGenerated.KotlinValueParameterWithJava.class})
 public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
     @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinClass extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinClass() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -37,62 +39,74 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("class1.kt")
         public void testClass1() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class1.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("class2.kt")
         public void testClass2() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/class2.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("classInString.kt")
         public void testClassInString() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/classInString.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("localClass1.kt")
         public void testLocalClass1() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass1.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("localClass2.kt")
         public void testLocalClass2() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/localClass2.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("nestedClass1.kt")
         public void testNestedClass1() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass1.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("nestedClass2.kt")
         public void testNestedClass2() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/nestedClass2.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("noUsages.kt")
         public void testNoUsages() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/noUsages.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("trait1.kt")
         public void testTrait1() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait1.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("trait2.kt")
         public void testTrait2() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/trait2.kt");
+            doClassTest(fileName);
         }
         
         @TestMetadata("unsafeImport.kt")
         public void testUnsafeImport() throws Exception {
-            doClassTest("idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteClass/kotlinClass/unsafeImport.kt");
+            doClassTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinObject extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinObject() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -100,52 +114,62 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("anonymousObject.kt")
         public void testAnonymousObject() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/anonymousObject.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("localObject1.kt")
         public void testLocalObject1() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject1.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("localObject2.kt")
         public void testLocalObject2() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/localObject2.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("nestedObject1.kt")
         public void testNestedObject1() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject1.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("nestedObject2.kt")
         public void testNestedObject2() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/nestedObject2.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("noUsages.kt")
         public void testNoUsages() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/noUsages.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("object1.kt")
         public void testObject1() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object1.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("object2.kt")
         public void testObject2() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/object2.kt");
+            doObjectTest(fileName);
         }
         
         @TestMetadata("unsafeImport.kt")
         public void testUnsafeImport() throws Exception {
-            doObjectTest("idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteObject/kotlinObject/unsafeImport.kt");
+            doObjectTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinFunction extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinFunction() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -153,92 +177,110 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("fun1.kt")
         public void testFun1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("fun2.kt")
         public void testFun2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/fun2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("funExt1.kt")
         public void testFunExt1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("funExt2.kt")
         public void testFunExt2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/funExt2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("implement1.kt")
         public void testImplement1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("implement2.kt")
         public void testImplement2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/implement2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("localFun1.kt")
         public void testLocalFun1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("localFun2.kt")
         public void testLocalFun2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFun2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("localFunExt1.kt")
         public void testLocalFunExt1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("localFunExt2.kt")
         public void testLocalFunExt2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/localFunExt2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("noUsages.kt")
         public void testNoUsages() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/noUsages.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("override1.kt")
         public void testOverride1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("override2.kt")
         public void testOverride2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/override2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement1.kt")
         public void testOverrideAndImplement1() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement1.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement2.kt")
         public void testOverrideAndImplement2() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement2.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement3.kt")
         public void testOverrideAndImplement3() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideAndImplement3.kt");
+            doFunctionTest(fileName);
         }
         
         @TestMetadata("overrideWithUsages.kt")
         public void testOverrideWithUsages() throws Exception {
-            doFunctionTest("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction/overrideWithUsages.kt");
+            doFunctionTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinFunctionWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinFunctionWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -246,57 +288,68 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("funExt.kt")
         public void testFunExt() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/funExt.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("implement1.kt")
         public void testImplement1() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement1.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("implement2.kt")
         public void testImplement2() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement2.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("implement3.kt")
         public void testImplement3() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement3.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("implement4.kt")
         public void testImplement4() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/implement4.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("override1.kt")
         public void testOverride1() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override1.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("override2.kt")
         public void testOverride2() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override2.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("override3.kt")
         public void testOverride3() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/override3.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("overrideAndImplement1.kt")
         public void testOverrideAndImplement1() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement1.kt");
+            doFunctionTestWithJava(fileName);
         }
         
         @TestMetadata("overrideAndImplement2.kt")
         public void testOverrideAndImplement2() throws Exception {
-            doFunctionTestWithJava("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava/overrideAndImplement2.kt");
+            doFunctionTestWithJava(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     public static class JavaFunctionWithKotlin extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInJavaFunctionWithKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -304,17 +357,20 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("mixedHierarchy1.kt")
         public void testMixedHierarchy1() throws Exception {
-            doJavaMethodTest("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy1.kt");
+            doJavaMethodTest(fileName);
         }
         
         @TestMetadata("mixedHierarchy2.kt")
         public void testMixedHierarchy2() throws Exception {
-            doJavaMethodTest("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin/mixedHierarchy2.kt");
+            doJavaMethodTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinProperty extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinProperty() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -322,117 +378,140 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("implement1.kt")
         public void testImplement1() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement1.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement2.kt")
         public void testImplement2() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement2.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement3.kt")
         public void testImplement3() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement3.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement4.kt")
         public void testImplement4() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement4.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement5.kt")
         public void testImplement5() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement5.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement6.kt")
         public void testImplement6() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement6.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement7.kt")
         public void testImplement7() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement7.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("implement8.kt")
         public void testImplement8() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/implement8.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("noUsages.kt")
         public void testNoUsages() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/noUsages.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("override1.kt")
         public void testOverride1() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override1.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("override2.kt")
         public void testOverride2() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override2.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("override3.kt")
         public void testOverride3() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override3.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("override4.kt")
         public void testOverride4() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/override4.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement1.kt")
         public void testOverrideAndImplement1() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement1.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement2.kt")
         public void testOverrideAndImplement2() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement2.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement3.kt")
         public void testOverrideAndImplement3() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement3.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("overrideAndImplement4.kt")
         public void testOverrideAndImplement4() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideAndImplement4.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("overrideWithUsages.kt")
         public void testOverrideWithUsages() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/overrideWithUsages.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("property1.kt")
         public void testProperty1() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property1.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("property2.kt")
         public void testProperty2() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/property2.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("propertyExt1.kt")
         public void testPropertyExt1() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt1.kt");
+            doPropertyTest(fileName);
         }
         
         @TestMetadata("propertyExt2.kt")
         public void testPropertyExt2() throws Exception {
-            doPropertyTest("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty/propertyExt2.kt");
+            doPropertyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinPropertyWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinPropertyWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -440,62 +519,74 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("implement1.kt")
         public void testImplement1() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement1.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("implement2.kt")
         public void testImplement2() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement2.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("implement3.kt")
         public void testImplement3() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement3.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("implement4.kt")
         public void testImplement4() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/implement4.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("override1.kt")
         public void testOverride1() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override1.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("override2.kt")
         public void testOverride2() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override2.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("override3.kt")
         public void testOverride3() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override3.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("override4.kt")
         public void testOverride4() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/override4.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("overrideAndImplement1.kt")
         public void testOverrideAndImplement1() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement1.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("overrideAndImplement2.kt")
         public void testOverrideAndImplement2() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/overrideAndImplement2.kt");
+            doPropertyTestWithJava(fileName);
         }
         
         @TestMetadata("propertyExt.kt")
         public void testPropertyExt() throws Exception {
-            doPropertyTestWithJava("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava/propertyExt.kt");
+            doPropertyTestWithJava(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     public static class JavaPropertyWithKotlin extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInJavaPropertyWithKotlin() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -503,37 +594,44 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("middleJava1.kt")
         public void testMiddleJava1() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava1.kt");
+            doJavaPropertyTest(fileName);
         }
         
         @TestMetadata("middleJava2.kt")
         public void testMiddleJava2() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava2.kt");
+            doJavaPropertyTest(fileName);
         }
         
         @TestMetadata("middleJava3.kt")
         public void testMiddleJava3() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava3.kt");
+            doJavaPropertyTest(fileName);
         }
         
         @TestMetadata("middleJava4.kt")
         public void testMiddleJava4() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava4.kt");
+            doJavaPropertyTest(fileName);
         }
         
         @TestMetadata("middleJava5.kt")
         public void testMiddleJava5() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava5.kt");
+            doJavaPropertyTest(fileName);
         }
         
         @TestMetadata("middleJava6.kt")
         public void testMiddleJava6() throws Exception {
-            doJavaPropertyTest("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin/middleJava6.kt");
+            doJavaPropertyTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinTypeParameter extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinTypeParameter() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -541,87 +639,104 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("internalUsages1.kt")
         public void testInternalUsages1() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages1.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("internalUsages2.kt")
         public void testInternalUsages2() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages2.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("internalUsages3.kt")
         public void testInternalUsages3() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages3.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("internalUsages4.kt")
         public void testInternalUsages4() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages4.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("internalUsages5.kt")
         public void testInternalUsages5() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/internalUsages5.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("safeUsagesWithConstraint1.kt")
         public void testSafeUsagesWithConstraint1() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint1.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("safeUsagesWithConstraint2.kt")
         public void testSafeUsagesWithConstraint2() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/safeUsagesWithConstraint2.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subclass1.kt")
         public void testSubclass1() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass1.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subclass2.kt")
         public void testSubclass2() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subclass2.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst1.kt")
         public void testSubst1() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst1.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst2.kt")
         public void testSubst2() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst2.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst3.kt")
         public void testSubst3() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst3.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst4.kt")
         public void testSubst4() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst4.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst5.kt")
         public void testSubst5() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst5.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst6.kt")
         public void testSubst6() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst6.kt");
+            doTypeParameterTest(fileName);
         }
         
         @TestMetadata("subst7.kt")
         public void testSubst7() throws Exception {
-            doTypeParameterTest("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter/subst7.kt");
+            doTypeParameterTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinTypeParameterWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -629,92 +744,110 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("internalUsages1.kt")
         public void testInternalUsages1() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages1.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsages2.kt")
         public void testInternalUsages2() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages2.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsages3.kt")
         public void testInternalUsages3() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages3.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsages4.kt")
         public void testInternalUsages4() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages4.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsages5.kt")
         public void testInternalUsages5() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/internalUsages5.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("rawType.kt")
         public void testRawType() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/rawType.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsagesWithConstraint1.kt")
         public void testSafeUsagesWithConstraint1() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint1.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsagesWithConstraint2.kt")
         public void testSafeUsagesWithConstraint2() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/safeUsagesWithConstraint2.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subclass1.kt")
         public void testSubclass1() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass1.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subclass2.kt")
         public void testSubclass2() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subclass2.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst1.kt")
         public void testSubst1() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst1.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst2.kt")
         public void testSubst2() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst2.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst3.kt")
         public void testSubst3() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst3.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst4.kt")
         public void testSubst4() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst4.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst5.kt")
         public void testSubst5() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst5.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst6.kt")
         public void testSubst6() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst6.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
         @TestMetadata("subst7.kt")
         public void testSubst7() throws Exception {
-            doTypeParameterTestWithJava("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava/subst7.kt");
+            doTypeParameterTestWithJava(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinValueParameter extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinValueParameter() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -722,162 +855,194 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("defaultParam1.kt")
         public void testDefaultParam1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("defaultParam2.kt")
         public void testDefaultParam2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/defaultParam2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("extNamedParam1.kt")
         public void testExtNamedParam1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("extNamedParam2.kt")
         public void testExtNamedParam2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/extNamedParam2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages1.kt")
         public void testHierarchyWithSafeUsages1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages2.kt")
         public void testHierarchyWithSafeUsages2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages3.kt")
         public void testHierarchyWithSafeUsages3() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages3.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages4.kt")
         public void testHierarchyWithSafeUsages4() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages4.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages5.kt")
         public void testHierarchyWithSafeUsages5() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithSafeUsages5.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages1.kt")
         public void testHierarchyWithUnsafeUsages1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages2.kt")
         public void testHierarchyWithUnsafeUsages2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages3.kt")
         public void testHierarchyWithUnsafeUsages3() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages3.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages4.kt")
         public void testHierarchyWithUnsafeUsages4() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages4.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages5.kt")
         public void testHierarchyWithUnsafeUsages5() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages5.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages6.kt")
         public void testHierarchyWithUnsafeUsages6() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages6.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages7.kt")
         public void testHierarchyWithUnsafeUsages7() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages7.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages8.kt")
         public void testHierarchyWithUnsafeUsages8() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/hierarchyWithUnsafeUsages8.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("internalUsage1.kt")
         public void testInternalUsage1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("internalUsage2.kt")
         public void testInternalUsage2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/internalUsage2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("lambdaArg.kt")
         public void testLambdaArg() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArg.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("lambdaArgExt.kt")
         public void testLambdaArgExt() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/lambdaArgExt.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("namedParam1.kt")
         public void testNamedParam1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("namedParam2.kt")
         public void testNamedParam2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/namedParam2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("propertyParam1.kt")
         public void testPropertyParam1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("propertyParam2.kt")
         public void testPropertyParam2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/propertyParam2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("safeUsages1.kt")
         public void testSafeUsages1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("safeUsages2.kt")
         public void testSafeUsages2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("safeUsages3.kt")
         public void testSafeUsages3() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsages3.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("safeUsagesExt1.kt")
         public void testSafeUsagesExt1() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt1.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("safeUsagesExt2.kt")
         public void testSafeUsagesExt2() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/safeUsagesExt2.kt");
+            doValueParameterTest(fileName);
         }
         
         @TestMetadata("setter.kt")
         public void testSetter() throws Exception {
-            doValueParameterTest("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter/setter.kt");
+            doValueParameterTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinValueParameterWithJava extends AbstractJetSafeDeleteTest {
         public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -885,137 +1050,164 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest {
         
         @TestMetadata("hierarchyWithSafeUsages1.kt")
         public void testHierarchyWithSafeUsages1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages2.kt")
         public void testHierarchyWithSafeUsages2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages3.kt")
         public void testHierarchyWithSafeUsages3() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages3.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages4.kt")
         public void testHierarchyWithSafeUsages4() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages4.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithSafeUsages5.kt")
         public void testHierarchyWithSafeUsages5() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithSafeUsages5.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages1.kt")
         public void testHierarchyWithUnsafeUsages1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages2.kt")
         public void testHierarchyWithUnsafeUsages2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages3.kt")
         public void testHierarchyWithUnsafeUsages3() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages3.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages4.kt")
         public void testHierarchyWithUnsafeUsages4() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages4.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("hierarchyWithUnsafeUsages5.kt")
         public void testHierarchyWithUnsafeUsages5() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/hierarchyWithUnsafeUsages5.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsage1.kt")
         public void testInternalUsage1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("internalUsage2.kt")
         public void testInternalUsage2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/internalUsage2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("lambdaArg.kt")
         public void testLambdaArg() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArg.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("lambdaArgExt.kt")
         public void testLambdaArgExt() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/lambdaArgExt.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchy1.kt")
         public void testMixedHierarchy1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchy2.kt")
         public void testMixedHierarchy2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchy3.kt")
         public void testMixedHierarchy3() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchy3.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchyWithUnsafeUsages1.kt")
         public void testMixedHierarchyWithUnsafeUsages1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchyWithUnsafeUsages2.kt")
         public void testMixedHierarchyWithUnsafeUsages2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("mixedHierarchyWithUnsafeUsages3.kt")
         public void testMixedHierarchyWithUnsafeUsages3() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/mixedHierarchyWithUnsafeUsages3.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("propertyParam1.kt")
         public void testPropertyParam1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("propertyParam2.kt")
         public void testPropertyParam2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/propertyParam2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsages1.kt")
         public void testSafeUsages1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsages2.kt")
         public void testSafeUsages2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsages3.kt")
         public void testSafeUsages3() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsages3.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsagesExt1.kt")
         public void testSafeUsagesExt1() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt1.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
         @TestMetadata("safeUsagesExt2.kt")
         public void testSafeUsagesExt2() throws Exception {
-            doValueParameterTestWithJava("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava/safeUsagesExt2.kt");
+            doValueParameterTestWithJava(fileName);
         }
         
     }
diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java
index 173c2ac7119..3ae1e2e4eb9 100644
--- a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.shortenRefs;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("idea/testData/shortenRefs")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({ShortenRefsTestGenerated.Constructor.class, ShortenRefsTestGenerated.Imports.class, ShortenRefsTestGenerated.Java.class, ShortenRefsTestGenerated.Type.class})
 public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     public void testAllFilesPresentInShortenRefs() throws Exception {
@@ -36,20 +38,24 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
     
     @TestMetadata("classObject.kt")
     public void testClassObject() throws Exception {
-        doTest("idea/testData/shortenRefs/classObject.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/classObject.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("JavaStaticMethod.kt")
     public void testJavaStaticMethod() throws Exception {
-        doTest("idea/testData/shortenRefs/JavaStaticMethod.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/JavaStaticMethod.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("noShortening.kt")
     public void testNoShortening() throws Exception {
-        doTest("idea/testData/shortenRefs/noShortening.kt");
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/noShortening.kt");
+        doTest(fileName);
     }
     
     @TestMetadata("idea/testData/shortenRefs/constructor")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructor extends AbstractShortenRefsTest {
         public void testAllFilesPresentInConstructor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/constructor"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -57,77 +63,92 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         
         @TestMetadata("Ambiguous.kt")
         public void testAmbiguous() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/Ambiguous.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/Ambiguous.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericType.kt")
         public void testGenericType() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/GenericType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/GenericType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified.kt")
         public void testLeaveQualified() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/LeaveQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified1.kt")
         public void testLeaveQualified1() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/LeaveQualified1.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified1.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified2.kt")
         public void testLeaveQualified2() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/LeaveQualified2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified3.kt")
         public void testLeaveQualified3() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/LeaveQualified3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified5.kt")
         public void testLeaveQualified5() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/LeaveQualified5.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/LeaveQualified5.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClass.kt")
         public void testNestedClass() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/NestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassWithImport.kt")
         public void testNestedClassWithImport() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/NestedClassWithImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NestedClassWithImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportNeeded.kt")
         public void testNoImportNeeded() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/NoImportNeeded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportNeeded2.kt")
         public void testNoImportNeeded2() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/NoImportNeeded2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportNeeded3.kt")
         public void testNoImportNeeded3() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/NoImportNeeded3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/NoImportNeeded3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WorksForClassNameRange.kt")
         public void testWorksForClassNameRange() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/WorksForClassNameRange.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("WorksForClassNameRange2.kt")
         public void testWorksForClassNameRange2() throws Exception {
-            doTest("idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/constructor/WorksForClassNameRange2.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/shortenRefs/imports")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Imports extends AbstractShortenRefsTest {
         public void testAllFilesPresentInImports() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -135,22 +156,26 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         
         @TestMetadata("leaveQualifiedConstructor.kt")
         public void testLeaveQualifiedConstructor() throws Exception {
-            doTest("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedConstructor.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("leaveQualifiedType.kt")
         public void testLeaveQualifiedType() throws Exception {
-            doTest("idea/testData/shortenRefs/imports/leaveQualifiedType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/leaveQualifiedType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("optimizeMultipleImports.kt")
         public void testOptimizeMultipleImports() throws Exception {
-            doTest("idea/testData/shortenRefs/imports/optimizeMultipleImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/imports/optimizeMultipleImports.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/shortenRefs/java")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Java extends AbstractShortenRefsTest {
         public void testAllFilesPresentInJava() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/java"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -158,47 +183,56 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         
         @TestMetadata("innerClassNoImports.kt")
         public void testInnerClassNoImports() throws Exception {
-            doTest("idea/testData/shortenRefs/java/innerClassNoImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassNoImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassOnDemandImport.kt")
         public void testInnerClassOnDemandImport() throws Exception {
-            doTest("idea/testData/shortenRefs/java/innerClassOnDemandImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/innerClassOnDemandImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticClassNoImports.kt")
         public void testStaticClassNoImports() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticClassNoImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassNoImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticClassOnDemandImport.kt")
         public void testStaticClassOnDemandImport() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticClassOnDemandImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticClassOnDemandImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticFieldNoImports.kt")
         public void testStaticFieldNoImports() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticFieldNoImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldNoImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticFieldOnDemandImport.kt")
         public void testStaticFieldOnDemandImport() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticFieldOnDemandImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticFieldOnDemandImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticMethodNoImports.kt")
         public void testStaticMethodNoImports() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticMethodNoImports.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodNoImports.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("staticMethodOnDemandImport.kt")
         public void testStaticMethodOnDemandImport() throws Exception {
-            doTest("idea/testData/shortenRefs/java/staticMethodOnDemandImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/java/staticMethodOnDemandImport.kt");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("idea/testData/shortenRefs/type")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Type extends AbstractShortenRefsTest {
         public void testAllFilesPresentInType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/type"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
@@ -206,87 +240,104 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
         
         @TestMetadata("ClassNameInsideArguments.kt")
         public void testClassNameInsideArguments() throws Exception {
-            doTest("idea/testData/shortenRefs/type/ClassNameInsideArguments.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideArguments.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassNameInsideLambda.kt")
         public void testClassNameInsideLambda() throws Exception {
-            doTest("idea/testData/shortenRefs/type/ClassNameInsideLambda.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassNameInsideLambda.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassSameNameAsPackage.kt")
         public void testClassSameNameAsPackage() throws Exception {
-            doTest("idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/ClassSameNameAsPackage.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("delegationSpecifier.kt")
         public void testDelegationSpecifier() throws Exception {
-            doTest("idea/testData/shortenRefs/type/delegationSpecifier.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/delegationSpecifier.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("FunctionType.kt")
         public void testFunctionType() throws Exception {
-            doTest("idea/testData/shortenRefs/type/FunctionType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/FunctionType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericType.kt")
         public void testGenericType() throws Exception {
-            doTest("idea/testData/shortenRefs/type/GenericType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericType2.kt")
         public void testGenericType2() throws Exception {
-            doTest("idea/testData/shortenRefs/type/GenericType2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("GenericType3.kt")
         public void testGenericType3() throws Exception {
-            doTest("idea/testData/shortenRefs/type/GenericType3.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/GenericType3.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("LeaveQualified.kt")
         public void testLeaveQualified() throws Exception {
-            doTest("idea/testData/shortenRefs/type/LeaveQualified.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/LeaveQualified.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClass.kt")
         public void testNestedClass() throws Exception {
-            doTest("idea/testData/shortenRefs/type/NestedClass.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClass.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NestedClassRefInImport.kt")
         public void testNestedClassRefInImport() throws Exception {
-            doTest("idea/testData/shortenRefs/type/NestedClassRefInImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NestedClassRefInImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportNeeded.kt")
         public void testNoImportNeeded() throws Exception {
-            doTest("idea/testData/shortenRefs/type/NoImportNeeded.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NoImportNeeded2.kt")
         public void testNoImportNeeded2() throws Exception {
-            doTest("idea/testData/shortenRefs/type/NoImportNeeded2.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NoImportNeeded2.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableType.kt")
         public void testNullableType() throws Exception {
-            doTest("idea/testData/shortenRefs/type/NullableType.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/NullableType.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SameClassTwice.kt")
         public void testSameClassTwice() throws Exception {
-            doTest("idea/testData/shortenRefs/type/SameClassTwice.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SameClassTwice.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("SimpleAddImport.kt")
         public void testSimpleAddImport() throws Exception {
-            doTest("idea/testData/shortenRefs/type/SimpleAddImport.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/SimpleAddImport.kt");
+            doTest(fileName);
         }
         
         @TestMetadata("TwoClassesSameNames.kt")
         public void testTwoClassesSameNames() throws Exception {
-            doTest("idea/testData/shortenRefs/type/TwoClassesSameNames.kt");
+            String fileName = JetTestUtils.navigationMetadata("idea/testData/shortenRefs/type/TwoClassesSameNames.kt");
+            doTest(fileName);
         }
         
     }
diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
index 986b132c712..d53ac340b86 100644
--- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
+++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.j2k.test;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("j2k/tests/testData/ast")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({JavaToKotlinConverterTestGenerated.Annotations.class, JavaToKotlinConverterTestGenerated.AnonymousBlock.class, JavaToKotlinConverterTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterTestGenerated.ArrayType.class, JavaToKotlinConverterTestGenerated.AssertStatement.class, JavaToKotlinConverterTestGenerated.AssignmentExpression.class, JavaToKotlinConverterTestGenerated.BinaryExpression.class, JavaToKotlinConverterTestGenerated.Blocks.class, JavaToKotlinConverterTestGenerated.BoxedType.class, JavaToKotlinConverterTestGenerated.BreakStatement.class, JavaToKotlinConverterTestGenerated.CallChainExpression.class, JavaToKotlinConverterTestGenerated.Class.class, JavaToKotlinConverterTestGenerated.ClassExpression.class, JavaToKotlinConverterTestGenerated.Comments.class, JavaToKotlinConverterTestGenerated.ConditionalExpression.class, JavaToKotlinConverterTestGenerated.Constructors.class, JavaToKotlinConverterTestGenerated.ContinueStatement.class, JavaToKotlinConverterTestGenerated.DeclarationStatement.class, JavaToKotlinConverterTestGenerated.DoWhileStatement.class, JavaToKotlinConverterTestGenerated.Enum.class, JavaToKotlinConverterTestGenerated.Equals.class, JavaToKotlinConverterTestGenerated.Field.class, JavaToKotlinConverterTestGenerated.For.class, JavaToKotlinConverterTestGenerated.ForeachStatement.class, JavaToKotlinConverterTestGenerated.Formatting.class, JavaToKotlinConverterTestGenerated.Function.class, JavaToKotlinConverterTestGenerated.Identifier.class, JavaToKotlinConverterTestGenerated.IfStatement.class, JavaToKotlinConverterTestGenerated.ImportStatement.class, JavaToKotlinConverterTestGenerated.InProjectionType.class, JavaToKotlinConverterTestGenerated.Inheritance.class, JavaToKotlinConverterTestGenerated.IsOperator.class, JavaToKotlinConverterTestGenerated.Issues.class, JavaToKotlinConverterTestGenerated.KotlinApiAccess.class, JavaToKotlinConverterTestGenerated.LabelStatement.class, JavaToKotlinConverterTestGenerated.List.class, JavaToKotlinConverterTestGenerated.LiteralExpression.class, JavaToKotlinConverterTestGenerated.LocalVariable.class, JavaToKotlinConverterTestGenerated.MethodCallExpression.class, JavaToKotlinConverterTestGenerated.Misc.class, JavaToKotlinConverterTestGenerated.NewClassExpression.class, JavaToKotlinConverterTestGenerated.Nullability.class, JavaToKotlinConverterTestGenerated.ObjectLiteral.class, JavaToKotlinConverterTestGenerated.OutProjectionType.class, JavaToKotlinConverterTestGenerated.PackageStatement.class, JavaToKotlinConverterTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterTestGenerated.PolyadicExpression.class, JavaToKotlinConverterTestGenerated.PostfixOperator.class, JavaToKotlinConverterTestGenerated.PrefixOperator.class, JavaToKotlinConverterTestGenerated.RawGenerics.class, JavaToKotlinConverterTestGenerated.ReturnStatement.class, JavaToKotlinConverterTestGenerated.Settings.class, JavaToKotlinConverterTestGenerated.StarProjectionType.class, JavaToKotlinConverterTestGenerated.StaticMembers.class, JavaToKotlinConverterTestGenerated.SuperExpression.class, JavaToKotlinConverterTestGenerated.Switch.class, JavaToKotlinConverterTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterTestGenerated.ThisExpression.class, JavaToKotlinConverterTestGenerated.ThrowStatement.class, JavaToKotlinConverterTestGenerated.ToKotlinClasses.class, JavaToKotlinConverterTestGenerated.Trait.class, JavaToKotlinConverterTestGenerated.TryStatement.class, JavaToKotlinConverterTestGenerated.TryWithResource.class, JavaToKotlinConverterTestGenerated.TypeCastExpression.class, JavaToKotlinConverterTestGenerated.TypeParameters.class, JavaToKotlinConverterTestGenerated.VarArg.class, JavaToKotlinConverterTestGenerated.WhileStatement.class})
 public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConverterTest {
     public void testAllFilesPresentInAst() throws Exception {
@@ -35,6 +37,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
     }
     
     @TestMetadata("j2k/tests/testData/ast/annotations")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Annotations extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAnnotations() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.java$"), true);
@@ -42,42 +45,50 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("annotationInterface1.java")
         public void testAnnotationInterface1() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/annotationInterface1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("annotationInterface2.java")
         public void testAnnotationInterface2() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/annotationInterface2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("annotationInterface3.java")
         public void testAnnotationInterface3() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/annotationInterface3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationInterface3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("annotationUsages.java")
         public void testAnnotationUsages() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/annotationUsages.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/annotationUsages.java");
+            doTest(fileName);
         }
         
         @TestMetadata("jetbrainsNotNull.java")
         public void testJetbrainsNotNull() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("jetbrainsNotNullChainExpr.java")
         public void testJetbrainsNotNullChainExpr() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.java");
+            doTest(fileName);
         }
         
         @TestMetadata("jetbrainsNullable.java")
         public void testJetbrainsNullable() throws Exception {
-            doTest("j2k/tests/testData/ast/annotations/jetbrainsNullable.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/annotations/jetbrainsNullable.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/anonymousBlock")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AnonymousBlock extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAnonymousBlock() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true);
@@ -85,17 +96,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("oneAnonBlock.java")
         public void testOneAnonBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneStaticAnonBlock.java")
         public void testOneStaticAnonBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayAccessExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -103,22 +117,26 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("expressionIndex.java")
         public void testExpressionIndex() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/expressionIndex.java");
+            doTest(fileName);
         }
         
         @TestMetadata("intIndex.java")
         public void testIntIndex() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayAccessExpression/intIndex.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/intIndex.java");
+            doTest(fileName);
         }
         
         @TestMetadata("variableIndex.java")
         public void testVariableIndex() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayAccessExpression/variableIndex.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayInitializerExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -126,67 +144,80 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("doubleArray.java")
         public void testDoubleArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("doubleArrayWithVariables.java")
         public void testDoubleArrayWithVariables() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.java");
+            doTest(fileName);
         }
         
         @TestMetadata("floatArray.java")
         public void testFloatArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/floatArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("intArrayWithLength.java")
         public void testIntArrayWithLength() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.java");
+            doTest(fileName);
         }
         
         @TestMetadata("javaLangDoubleArray.java")
         public void testJavaLangDoubleArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("javaLangFloatArray.java")
         public void testJavaLangFloatArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newByte.java")
         public void testNewByte() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/newByte.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newByte.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newInt.java")
         public void testNewInt() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/newInt.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/newInt.java");
+            doTest(fileName);
         }
         
         @TestMetadata("objectArrayWithLength.java")
         public void testObjectArrayWithLength() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneDim.java")
         public void testOneDim() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDim.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneDimWithVariables.java")
         public void testOneDimWithVariables() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.java");
+            doTest(fileName);
         }
         
         @TestMetadata("twoDim.java")
         public void testTwoDim() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayInitializerExpression/twoDim.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/arrayType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ArrayType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInArrayType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.java$"), true);
@@ -194,57 +225,68 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("arrayInitializationStatement.java")
         public void testArrayInitializationStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatement.java");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayInitializationStatementWithDimension.java")
         public void testArrayInitializationStatementWithDimension() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.java");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayInitializationStatementWithDimension3d.java")
         public void testArrayInitializationStatementWithDimension3d() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.java");
+            doTest(fileName);
         }
         
         @TestMetadata("arrayInitializationStatementWithDimensionExplicit.java")
         public void testArrayInitializationStatementWithDimensionExplicit() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("d2StringEmptyArray.java")
         public void testD2StringEmptyArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d2StringEmptyArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("d3StringEmptyArray.java")
         public void testD3StringEmptyArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/d3StringEmptyArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("longArray.java")
         public void testLongArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/longArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/longArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodArrayArgs.java")
         public void testMethodArrayArgs() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/methodArrayArgs.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/methodArrayArgs.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newIntArray.java")
         public void testNewIntArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/newIntArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newIntArray.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newStringArray.java")
         public void testNewStringArray() throws Exception {
-            doTest("j2k/tests/testData/ast/arrayType/newStringArray.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/arrayType/newStringArray.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/assertStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AssertStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAssertStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -252,27 +294,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("onlyCondition.java")
         public void testOnlyCondition() throws Exception {
-            doTest("j2k/tests/testData/ast/assertStatement/onlyCondition.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyCondition.java");
+            doTest(fileName);
         }
         
         @TestMetadata("onlyConditionWithBraces.java")
         public void testOnlyConditionWithBraces() throws Exception {
-            doTest("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/onlyConditionWithBraces.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withStringDetail.java")
         public void testWithStringDetail() throws Exception {
-            doTest("j2k/tests/testData/ast/assertStatement/withStringDetail.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withStringDetail2.java")
         public void testWithStringDetail2() throws Exception {
-            doTest("j2k/tests/testData/ast/assertStatement/withStringDetail2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assertStatement/withStringDetail2.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/assignmentExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class AssignmentExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInAssignmentExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -280,82 +327,98 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("and.java")
         public void testAnd() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/and.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/and.java");
+            doTest(fileName);
         }
         
         @TestMetadata("assignment.java")
         public void testAssignment() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/assignment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/assignment.java");
+            doTest(fileName);
         }
         
         @TestMetadata("divideAssign.java")
         public void testDivideAssign() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/divideAssign.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/divideAssign.java");
+            doTest(fileName);
         }
         
         @TestMetadata("minusAssign.java")
         public void testMinusAssign() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/minusAssign.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/minusAssign.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplyAssign.java")
         public void testMultiplyAssign() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/multiplyAssign.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability.java")
         public void testNullability() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/nullability.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nullability-settings.java")
         public void testNullability_settings() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/nullability-settings.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/nullability-settings.java");
+            doTest(fileName);
         }
         
         @TestMetadata("or.java")
         public void testOr() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/or.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/or.java");
+            doTest(fileName);
         }
         
         @TestMetadata("plusAssign.java")
         public void testPlusAssign() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/plusAssign.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/plusAssign.java");
+            doTest(fileName);
         }
         
         @TestMetadata("reminder.java")
         public void testReminder() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/reminder.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/reminder.java");
+            doTest(fileName);
         }
         
         @TestMetadata("shiftLeft.java")
         public void testShiftLeft() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/shiftLeft.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftLeft.java");
+            doTest(fileName);
         }
         
         @TestMetadata("shiftRight.java")
         public void testShiftRight() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/shiftRight.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/shiftRight.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleAssignment.java")
         public void testSimpleAssignment() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/simpleAssignment.java");
+            doTest(fileName);
         }
         
         @TestMetadata("unsignedRightShift.java")
         public void testUnsignedRightShift() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/unsignedRightShift.java");
+            doTest(fileName);
         }
         
         @TestMetadata("xor.java")
         public void testXor() throws Exception {
-            doTest("j2k/tests/testData/ast/assignmentExpression/xor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/assignmentExpression/xor.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/binaryExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BinaryExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBinaryExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -363,97 +426,116 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("and.java")
         public void testAnd() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/and.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/and.java");
+            doTest(fileName);
         }
         
         @TestMetadata("conditionalAnd.java")
         public void testConditionalAnd() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/conditionalAnd.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalAnd.java");
+            doTest(fileName);
         }
         
         @TestMetadata("conditionalOr.java")
         public void testConditionalOr() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/conditionalOr.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/conditionalOr.java");
+            doTest(fileName);
         }
         
         @TestMetadata("divide.java")
         public void testDivide() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/divide.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/divide.java");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThan.java")
         public void testGreaterThan() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/greaterThan.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThan.java");
+            doTest(fileName);
         }
         
         @TestMetadata("greaterThanEqual.java")
         public void testGreaterThanEqual() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/greaterThanEqual.java");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThan.java")
         public void testLessThan() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/lessThan.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThan.java");
+            doTest(fileName);
         }
         
         @TestMetadata("lessThanEqual.java")
         public void testLessThanEqual() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/lessThanEqual.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/lessThanEqual.java");
+            doTest(fileName);
         }
         
         @TestMetadata("minus.java")
         public void testMinus() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/minus.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/minus.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplePlusMinus.java")
         public void testMultiplePlusMinus() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiplePlusMinus.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiply.java")
         public void testMultiply() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/multiply.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/multiply.java");
+            doTest(fileName);
         }
         
         @TestMetadata("or.java")
         public void testOr() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/or.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/or.java");
+            doTest(fileName);
         }
         
         @TestMetadata("plus.java")
         public void testPlus() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/plus.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/plus.java");
+            doTest(fileName);
         }
         
         @TestMetadata("remainder.java")
         public void testRemainder() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/remainder.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/remainder.java");
+            doTest(fileName);
         }
         
         @TestMetadata("shiftLeft.java")
         public void testShiftLeft() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/shiftLeft.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftLeft.java");
+            doTest(fileName);
         }
         
         @TestMetadata("shiftRight.java")
         public void testShiftRight() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/shiftRight.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/shiftRight.java");
+            doTest(fileName);
         }
         
         @TestMetadata("unsignedRightShift.java")
         public void testUnsignedRightShift() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/unsignedRightShift.java");
+            doTest(fileName);
         }
         
         @TestMetadata("xor.java")
         public void testXor() throws Exception {
-            doTest("j2k/tests/testData/ast/binaryExpression/xor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/binaryExpression/xor.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/blocks")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Blocks extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBlocks() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/blocks"), Pattern.compile("^(.+)\\.java$"), true);
@@ -461,12 +543,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("Blocks.java")
         public void testBlocks() throws Exception {
-            doTest("j2k/tests/testData/ast/blocks/Blocks.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/blocks/Blocks.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/boxedType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BoxedType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBoxedType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.java$"), true);
@@ -474,62 +558,74 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("boolean.java")
         public void testBoolean() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/boolean.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/boolean.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Boxing.java")
         public void testBoxing() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/Boxing.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/Boxing.java");
+            doTest(fileName);
         }
         
         @TestMetadata("byte.java")
         public void testByte() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/byte.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/byte.java");
+            doTest(fileName);
         }
         
         @TestMetadata("character.java")
         public void testCharacter() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/character.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/character.java");
+            doTest(fileName);
         }
         
         @TestMetadata("double.java")
         public void testDouble() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/double.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/double.java");
+            doTest(fileName);
         }
         
         @TestMetadata("float.java")
         public void testFloat() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/float.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/float.java");
+            doTest(fileName);
         }
         
         @TestMetadata("integer.java")
         public void testInteger() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/integer.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/integer.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-671.java")
         public void testKt_671() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/kt-671.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/kt-671.java");
+            doTest(fileName);
         }
         
         @TestMetadata("long.java")
         public void testLong() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/long.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/long.java");
+            doTest(fileName);
         }
         
         @TestMetadata("object.java")
         public void testObject() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/object.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/object.java");
+            doTest(fileName);
         }
         
         @TestMetadata("short.java")
         public void testShort() throws Exception {
-            doTest("j2k/tests/testData/ast/boxedType/short.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/boxedType/short.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/breakStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class BreakStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInBreakStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -537,17 +633,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("breakWithLabel.java")
         public void testBreakWithLabel() throws Exception {
-            doTest("j2k/tests/testData/ast/breakStatement/breakWithLabel.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithLabel.java");
+            doTest(fileName);
         }
         
         @TestMetadata("breakWithoutLabel.java")
         public void testBreakWithoutLabel() throws Exception {
-            doTest("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/breakStatement/breakWithoutLabel.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/callChainExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class CallChainExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInCallChainExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -555,46 +654,55 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("libraryFieldCall.java")
         public void testLibraryFieldCall() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryFieldCall.java");
+            doTest(fileName);
         }
         
         @TestMetadata("libraryMethodCall.java")
         public void testLibraryMethodCall() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCall.java");
+            doTest(fileName);
         }
         
         @TestMetadata("libraryMethodCallFromInstance.java")
         public void testLibraryMethodCallFromInstance() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.java");
+            doTest(fileName);
         }
         
         @TestMetadata("libraryMethodCallFromInstance-settings.java")
         public void testLibraryMethodCallFromInstance_settings() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance-settings.java");
+            doTest(fileName);
         }
         
         @TestMetadata("libraryStringFieldCall.java")
         public void testLibraryStringFieldCall() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.java");
+            doTest(fileName);
         }
         
         @TestMetadata("sout.java")
         public void testSout() throws Exception {
-            doTest("j2k/tests/testData/ast/callChainExpression/sout.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/callChainExpression/sout.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/class")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Class extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstractClass.java")
         public void testAbstractClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/abstractClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("abstractClassShape.java")
         public void testAbstractClassShape() throws Exception {
-            doTest("j2k/tests/testData/ast/class/abstractClassShape.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/abstractClassShape.java");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInClass() throws Exception {
@@ -603,137 +711,164 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("class.java")
         public void testClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/class.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/class.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ClassShadowing.java")
         public void testClassShadowing() throws Exception {
-            doTest("j2k/tests/testData/ast/class/ClassShadowing.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/ClassShadowing.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classWithEmptyMethods.java")
         public void testClassWithEmptyMethods() throws Exception {
-            doTest("j2k/tests/testData/ast/class/classWithEmptyMethods.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithEmptyMethods.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classWithFields.java")
         public void testClassWithFields() throws Exception {
-            doTest("j2k/tests/testData/ast/class/classWithFields.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithFields.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classWithMultiplyFields.java")
         public void testClassWithMultiplyFields() throws Exception {
-            doTest("j2k/tests/testData/ast/class/classWithMultiplyFields.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/classWithMultiplyFields.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyClass.java")
         public void testEmptyClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/emptyClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/emptyClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("extendsOneClassAndImplementsOneInterface.java")
         public void testExtendsOneClassAndImplementsOneInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java")
         public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
-            doTest("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.java");
+            doTest(fileName);
         }
         
         @TestMetadata("finalClass.java")
         public void testFinalClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/finalClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/finalClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericClass.java")
         public void testGenericClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/genericClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/genericClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("innerClassInInterface.java")
         public void testInnerClassInInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/class/innerClassInInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerClassInInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("innerEmptyClass.java")
         public void testInnerEmptyClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/innerEmptyClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEmptyClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("innerEnum.java")
         public void testInnerEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/class/innerEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("innerInterface.java")
         public void testInnerInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/class/innerInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("innerStaticClass.java")
         public void testInnerStaticClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/innerStaticClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/innerStaticClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("internalClass.java")
         public void testInternalClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/internalClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/internalClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-639.java")
         public void testKt_639() throws Exception {
-            doTest("j2k/tests/testData/ast/class/kt-639.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/kt-639.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneStaticFieldOneNonStatic.java")
         public void testOneStaticFieldOneNonStatic() throws Exception {
-            doTest("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneStaticMethod.java")
         public void testOneStaticMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/class/oneStaticMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethod.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneStaticMethodOneNonStatic.java")
         public void testOneStaticMethodOneNonStatic() throws Exception {
-            doTest("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.java");
+            doTest(fileName);
         }
         
         @TestMetadata("pivateClass.java")
         public void testPivateClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/pivateClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/pivateClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("privateInit.java")
         public void testPrivateInit() throws Exception {
-            doTest("j2k/tests/testData/ast/class/privateInit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/privateInit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("protectedClass.java")
         public void testProtectedClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/protectedClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/protectedClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("publicClass.java")
         public void testPublicClass() throws Exception {
-            doTest("j2k/tests/testData/ast/class/publicClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/publicClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleInheritance.java")
         public void testSimpleInheritance() throws Exception {
-            doTest("j2k/tests/testData/ast/class/simpleInheritance.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/simpleInheritance.java");
+            doTest(fileName);
         }
         
         @TestMetadata("twoStaticMethod.java")
         public void testTwoStaticMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/class/twoStaticMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/class/twoStaticMethod.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/classExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ClassExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInClassExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -741,27 +876,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("complexExample.java")
         public void testComplexExample() throws Exception {
-            doTest("j2k/tests/testData/ast/classExpression/complexExample.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/complexExample.java");
+            doTest(fileName);
         }
         
         @TestMetadata("objectClass.java")
         public void testObjectClass() throws Exception {
-            doTest("j2k/tests/testData/ast/classExpression/objectClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/objectClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("primitivesAndArrays.java")
         public void testPrimitivesAndArrays() throws Exception {
-            doTest("j2k/tests/testData/ast/classExpression/primitivesAndArrays.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/primitivesAndArrays.java");
+            doTest(fileName);
         }
         
         @TestMetadata("stringClass.java")
         public void testStringClass() throws Exception {
-            doTest("j2k/tests/testData/ast/classExpression/stringClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/classExpression/stringClass.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/comments")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Comments extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInComments() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/comments"), Pattern.compile("^(.+)\\.java$"), true);
@@ -769,32 +909,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("comments.java")
         public void testComments() throws Exception {
-            doTest("j2k/tests/testData/ast/comments/comments.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments.java");
+            doTest(fileName);
         }
         
         @TestMetadata("comments2.java")
         public void testComments2() throws Exception {
-            doTest("j2k/tests/testData/ast/comments/comments2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/comments2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("commentsForConstructors.java")
         public void testCommentsForConstructors() throws Exception {
-            doTest("j2k/tests/testData/ast/comments/commentsForConstructors.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/commentsForConstructors.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldWithEndOfLineComment.java")
         public void testFieldWithEndOfLineComment() throws Exception {
-            doTest("j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldWithEndOfLineComment.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams.java")
         public void testFieldsInitializedFromParams() throws Exception {
-            doTest("j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/comments/fieldsInitializedFromParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/conditionalExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ConditionalExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInConditionalExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -802,26 +948,31 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("multiline.java")
         public void testMultiline() throws Exception {
-            doTest("j2k/tests/testData/ast/conditionalExpression/multiline.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/multiline.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simple.java")
         public void testSimple() throws Exception {
-            doTest("j2k/tests/testData/ast/conditionalExpression/simple.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/conditionalExpression/simple.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/constructors")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Constructors extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("allCallsPrimary.java")
         public void testAllCallsPrimary() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/allCallsPrimary.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary.java");
+            doTest(fileName);
         }
         
         @TestMetadata("allCallsPrimary2.java")
         public void testAllCallsPrimary2() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/allCallsPrimary2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/allCallsPrimary2.java");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInConstructors() throws Exception {
@@ -830,182 +981,218 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("artificialPrimary.java")
         public void testArtificialPrimary() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/artificialPrimary.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/artificialPrimary.java");
+            doTest(fileName);
         }
         
         @TestMetadata("chain.java")
         public void testChain() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/chain.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/chain.java");
+            doTest(fileName);
         }
         
         @TestMetadata("constructorAnnotations.java")
         public void testConstructorAnnotations() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/constructorAnnotations.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/constructorAnnotations.java");
+            doTest(fileName);
         }
         
         @TestMetadata("customerBuilder.java")
         public void testCustomerBuilder() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/customerBuilder.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/customerBuilder.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams1.java")
         public void testFieldsInitializedFromParams1() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams2.java")
         public void testFieldsInitializedFromParams2() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams3.java")
         public void testFieldsInitializedFromParams3() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams4.java")
         public void testFieldsInitializedFromParams4() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams5.java")
         public void testFieldsInitializedFromParams5() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams6.java")
         public void testFieldsInitializedFromParams6() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams7.java")
         public void testFieldsInitializedFromParams7() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams8.java")
         public void testFieldsInitializedFromParams8() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams8.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsInitializedFromParams9.java")
         public void testFieldsInitializedFromParams9() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/fieldsInitializedFromParams9.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericIdentifier.java")
         public void testGenericIdentifier() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/genericIdentifier.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/genericIdentifier.java");
+            doTest(fileName);
         }
         
         @TestMetadata("identifier.java")
         public void testIdentifier() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/identifier.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/identifier.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodCallInFactoryFun.java")
         public void testMethodCallInFactoryFun() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/methodCallInFactoryFun.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassNameInParameterDefaults.java")
         public void testNestedClassNameInParameterDefaults() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassNameInParameterDefaults2.java")
         public void testNestedClassNameInParameterDefaults2() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassNameInParameterDefaults3.java")
         public void testNestedClassNameInParameterDefaults3() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassNameInParameterDefaults4.java")
         public void testNestedClassNameInParameterDefaults4() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInParameterDefaults4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nestedClassNameInSuperParameters.java")
         public void testNestedClassNameInSuperParameters() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/nestedClassNameInSuperParameters.java");
+            doTest(fileName);
         }
         
         @TestMetadata("noPrimary.java")
         public void testNoPrimary() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/noPrimary.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/noPrimary.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterDefaults1.java")
         public void testParameterDefaults1() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterDefaults1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterDefaults2.java")
         public void testParameterDefaults2() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterDefaults2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterDefaults3.java")
         public void testParameterDefaults3() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterDefaults3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterDefaults4.java")
         public void testParameterDefaults4() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterDefaults4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterDefaults5.java")
         public void testParameterDefaults5() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterDefaults5.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterDefaults5.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterModification.java")
         public void testParameterModification() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/parameterModification.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/parameterModification.java");
+            doTest(fileName);
         }
         
         @TestMetadata("privateConstructors.java")
         public void testPrivateConstructors() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/privateConstructors.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/privateConstructors.java");
+            doTest(fileName);
         }
         
         @TestMetadata("qualifiedRefInFactoryFun.java")
         public void testQualifiedRefInFactoryFun() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/qualifiedRefInFactoryFun.java");
+            doTest(fileName);
         }
         
         @TestMetadata("secondaryConstructorsInInnerClass.java")
         public void testSecondaryConstructorsInInnerClass() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInInnerClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("secondaryConstructorsInNestedClass.java")
         public void testSecondaryConstructorsInNestedClass() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsInNestedClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("secondaryConstructorsVisibility.java")
         public void testSecondaryConstructorsVisibility() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/secondaryConstructorsVisibility.java");
+            doTest(fileName);
         }
         
         @TestMetadata("staticFieldRefInFactoryFun.java")
         public void testStaticFieldRefInFactoryFun() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/staticFieldRefInFactoryFun.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withManyDefaultParams.java")
         public void testWithManyDefaultParams() throws Exception {
-            doTest("j2k/tests/testData/ast/constructors/withManyDefaultParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/constructors/withManyDefaultParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/continueStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ContinueStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInContinueStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1013,17 +1200,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("continueWithLabel.java")
         public void testContinueWithLabel() throws Exception {
-            doTest("j2k/tests/testData/ast/continueStatement/continueWithLabel.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithLabel.java");
+            doTest(fileName);
         }
         
         @TestMetadata("continueWithoutLabel.java")
         public void testContinueWithoutLabel() throws Exception {
-            doTest("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/continueStatement/continueWithoutLabel.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/declarationStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DeclarationStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInDeclarationStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1031,37 +1221,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("multiplyFinalIntDeclaration.java")
         public void testMultiplyFinalIntDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplyIntDeclaration.java")
         public void testMultiplyIntDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("singleFinalIntDeclaration.java")
         public void testSingleFinalIntDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("singleFinalStringDeclaration.java")
         public void testSingleFinalStringDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("singleIntDeclaration.java")
         public void testSingleIntDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("singleStringDeclaration.java")
         public void testSingleStringDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/doWhileStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class DoWhileStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInDoWhileStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1069,27 +1266,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("whileWithBlock.java")
         public void testWhileWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithEmptyBlock.java")
         public void testWhileWithEmptyBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithExpression.java")
         public void testWhileWithExpression() throws Exception {
-            doTest("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithExpression.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithReturn.java")
         public void testWhileWithReturn() throws Exception {
-            doTest("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/doWhileStatement/whileWithReturn.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/enum")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Enum extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInEnum() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1097,82 +1299,98 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("colorEnum.java")
         public void testColorEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/colorEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/colorEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyEnum.java")
         public void testEmptyEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/emptyEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/emptyEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enumConstantIsNotNull.java")
         public void testEnumConstantIsNotNull() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/enumConstantIsNotNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumConstantIsNotNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enumImplementsOneInterface.java")
         public void testEnumImplementsOneInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/enumImplementsOneInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsOneInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enumImplementsSeveralInterfaces.java")
         public void testEnumImplementsSeveralInterfaces() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enumWithNameField.java")
         public void testEnumWithNameField() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/enumWithNameField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/enumWithNameField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fieldsWithPrimaryPrivateConstructor.java")
         public void testFieldsWithPrimaryPrivateConstructor() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.java");
+            doTest(fileName);
         }
         
         @TestMetadata("internalEnum.java")
         public void testInternalEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/internalEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/internalEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideToString.java")
         public void testOverrideToString() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/overrideToString.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/overrideToString.java");
+            doTest(fileName);
         }
         
         @TestMetadata("primaryPrivateConstructor.java")
         public void testPrimaryPrivateConstructor() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/primaryPrivateConstructor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/primaryPrivateConstructor.java");
+            doTest(fileName);
         }
         
         @TestMetadata("privateEnum.java")
         public void testPrivateEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/privateEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/privateEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("protectedEnum.java")
         public void testProtectedEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/protectedEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/protectedEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("publicEnum.java")
         public void testPublicEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/publicEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/publicEnum.java");
+            doTest(fileName);
         }
         
         @TestMetadata("runnableImplementation.java")
         public void testRunnableImplementation() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/runnableImplementation.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/runnableImplementation.java");
+            doTest(fileName);
         }
         
         @TestMetadata("typeSafeEnum.java")
         public void testTypeSafeEnum() throws Exception {
-            doTest("j2k/tests/testData/ast/enum/typeSafeEnum.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/enum/typeSafeEnum.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/equals")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Equals extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInEquals() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/equals"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1180,32 +1398,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("Equals1.java")
         public void testEquals1() throws Exception {
-            doTest("j2k/tests/testData/ast/equals/Equals1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Equals2.java")
         public void testEquals2() throws Exception {
-            doTest("j2k/tests/testData/ast/equals/Equals2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Equals3.java")
         public void testEquals3() throws Exception {
-            doTest("j2k/tests/testData/ast/equals/Equals3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Equals4.java")
         public void testEquals4() throws Exception {
-            doTest("j2k/tests/testData/ast/equals/Equals4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/Equals4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectsEquals.java")
         public void testObjectsEquals() throws Exception {
-            doTest("j2k/tests/testData/ast/equals/ObjectsEquals.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/equals/ObjectsEquals.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/field")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Field extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInField() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1213,67 +1437,80 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classChildExtendsBase.java")
         public void testClassChildExtendsBase() throws Exception {
-            doTest("j2k/tests/testData/ast/field/classChildExtendsBase.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/classChildExtendsBase.java");
+            doTest(fileName);
         }
         
         @TestMetadata("conversion.java")
         public void testConversion() throws Exception {
-            doTest("j2k/tests/testData/ast/field/conversion.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/conversion.java");
+            doTest(fileName);
         }
         
         @TestMetadata("internalField.java")
         public void testInternalField() throws Exception {
-            doTest("j2k/tests/testData/ast/field/internalField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/internalField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("privateField.java")
         public void testPrivateField() throws Exception {
-            doTest("j2k/tests/testData/ast/field/privateField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/privateField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("protectedField.java")
         public void testProtectedField() throws Exception {
-            doTest("j2k/tests/testData/ast/field/protectedField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/protectedField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("publicField.java")
         public void testPublicField() throws Exception {
-            doTest("j2k/tests/testData/ast/field/publicField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/publicField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("specifyType.java")
         public void testSpecifyType() throws Exception {
-            doTest("j2k/tests/testData/ast/field/specifyType.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/specifyType.java");
+            doTest(fileName);
         }
         
         @TestMetadata("valOrVar.java")
         public void testValOrVar() throws Exception {
-            doTest("j2k/tests/testData/ast/field/valOrVar.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valOrVar.java");
+            doTest(fileName);
         }
         
         @TestMetadata("valWithInit.java")
         public void testValWithInit() throws Exception {
-            doTest("j2k/tests/testData/ast/field/valWithInit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/valWithInit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("varWithInit.java")
         public void testVarWithInit() throws Exception {
-            doTest("j2k/tests/testData/ast/field/varWithInit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithInit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("varWithoutInit.java")
         public void testVarWithoutInit() throws Exception {
-            doTest("j2k/tests/testData/ast/field/varWithoutInit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/varWithoutInit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("volatileTransientAndStrictFp.java")
         public void testVolatileTransientAndStrictFp() throws Exception {
-            doTest("j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/field/volatileTransientAndStrictFp.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/for")
+    @TestDataPath("$PROJECT_ROOT")
     public static class For extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInFor() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1281,97 +1518,116 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("commonCaseForTest.java")
         public void testCommonCaseForTest() throws Exception {
-            doTest("j2k/tests/testData/ast/for/commonCaseForTest.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/commonCaseForTest.java");
+            doTest(fileName);
         }
         
         @TestMetadata("falseForRange.java")
         public void testFalseForRange() throws Exception {
-            doTest("j2k/tests/testData/ast/for/falseForRange.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/falseForRange.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forRangeWithBlock.java")
         public void testForRangeWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forRangeWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forRangeWithLE.java")
         public void testForRangeWithLE() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forRangeWithLE.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLE.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forRangeWithLT.java")
         public void testForRangeWithLT() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forRangeWithLT.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forRangeWithLT.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forThroughArrayIndices.java")
         public void testForThroughArrayIndices() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forThroughArrayIndices.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughArrayIndices.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forThroughListIndices.java")
         public void testForThroughListIndices() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forThroughListIndices.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughListIndices.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forThroughNonArrayIndices.java")
         public void testForThroughNonArrayIndices() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forThroughNonArrayIndices.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonArrayIndices.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forThroughNonCollectionIndices.java")
         public void testForThroughNonCollectionIndices() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forThroughNonCollectionIndices.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithBlock.java")
         public void testForWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithBlockAndDoubleUpdate.java")
         public void testForWithBlockAndDoubleUpdate() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithEmptyBlock.java")
         public void testForWithEmptyBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithEmptyBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithEmptyBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithExpression.java")
         public void testForWithExpression() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithExpression.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithExpression.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithNullCondition.java")
         public void testForWithNullCondition() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithNullCondition.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullCondition.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithNullInit.java")
         public void testForWithNullInit() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithNullInit.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullInit.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithNullUpdate.java")
         public void testForWithNullUpdate() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithNullUpdate.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithNullUpdate.java");
+            doTest(fileName);
         }
         
         @TestMetadata("forWithReturn.java")
         public void testForWithReturn() throws Exception {
-            doTest("j2k/tests/testData/ast/for/forWithReturn.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/forWithReturn.java");
+            doTest(fileName);
         }
         
         @TestMetadata("infiniteFor.java")
         public void testInfiniteFor() throws Exception {
-            doTest("j2k/tests/testData/ast/for/infiniteFor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/for/infiniteFor.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/foreachStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ForeachStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInForeachStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1379,32 +1635,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("enhancedForWithBlock.java")
         public void testEnhancedForWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enhancedForWithEmptyBlock.java")
         public void testEnhancedForWithEmptyBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enhancedForWithExpression.java")
         public void testEnhancedForWithExpression() throws Exception {
-            doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enhancedForWithReturn.java")
         public void testEnhancedForWithReturn() throws Exception {
-            doTest("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableIterable.java")
         public void testNullableIterable() throws Exception {
-            doTest("j2k/tests/testData/ast/foreachStatement/nullableIterable.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/foreachStatement/nullableIterable.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/formatting")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Formatting extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInFormatting() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1412,31 +1674,37 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("nonStaticMembers.java")
         public void testNonStaticMembers() throws Exception {
-            doTest("j2k/tests/testData/ast/formatting/nonStaticMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembers.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nonStaticMembersWithComments.java")
         public void testNonStaticMembersWithComments() throws Exception {
-            doTest("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/nonStaticMembersWithComments.java");
+            doTest(fileName);
         }
         
         @TestMetadata("staticAndNonStaticMembersWithComments.java")
         public void testStaticAndNonStaticMembersWithComments() throws Exception {
-            doTest("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticAndNonStaticMembersWithComments.java");
+            doTest(fileName);
         }
         
         @TestMetadata("staticMembersWithComments.java")
         public void testStaticMembersWithComments() throws Exception {
-            doTest("j2k/tests/testData/ast/formatting/staticMembersWithComments.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/formatting/staticMembersWithComments.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/function")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Function extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstractMethod.java")
         public void testAbstractMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/function/abstractMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/abstractMethod.java");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInFunction() throws Exception {
@@ -1445,147 +1713,176 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classGenericParam.java")
         public void testClassGenericParam() throws Exception {
-            doTest("j2k/tests/testData/ast/function/classGenericParam.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/classGenericParam.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyVoidMethod.java")
         public void testEmptyVoidMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/function/emptyVoidMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/emptyVoidMethod.java");
+            doTest(fileName);
         }
         
         @TestMetadata("extendsBaseWhichExtendsObject.java")
         public void testExtendsBaseWhichExtendsObject() throws Exception {
-            doTest("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.java");
+            doTest(fileName);
         }
         
         @TestMetadata("final.java")
         public void testFinal() throws Exception {
-            doTest("j2k/tests/testData/ast/function/final.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/final.java");
+            doTest(fileName);
         }
         
         @TestMetadata("functionInFinalClass.java")
         public void testFunctionInFinalClass() throws Exception {
-            doTest("j2k/tests/testData/ast/function/functionInFinalClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/functionInFinalClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("internal.java")
         public void testInternal() throws Exception {
-            doTest("j2k/tests/testData/ast/function/internal.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/internal.java");
+            doTest(fileName);
         }
         
         @TestMetadata("main.java")
         public void testMain() throws Exception {
-            doTest("j2k/tests/testData/ast/function/main.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main.java");
+            doTest(fileName);
         }
         
         @TestMetadata("main2.java")
         public void testMain2() throws Exception {
-            doTest("j2k/tests/testData/ast/function/main2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/main2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("mainAndNullabilitySetting.java")
         public void testMainAndNullabilitySetting() throws Exception {
-            doTest("j2k/tests/testData/ast/function/mainAndNullabilitySetting.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/mainAndNullabilitySetting.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodClassType.java")
         public void testMethodClassType() throws Exception {
-            doTest("j2k/tests/testData/ast/function/methodClassType.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodClassType.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodPrimitiveType.java")
         public void testMethodPrimitiveType() throws Exception {
-            doTest("j2k/tests/testData/ast/function/methodPrimitiveType.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodPrimitiveType2.java")
         public void testMethodPrimitiveType2() throws Exception {
-            doTest("j2k/tests/testData/ast/function/methodPrimitiveType2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodPrimitiveType2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodWithReturnStatement.java")
         public void testMethodWithReturnStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/function/methodWithReturnStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/methodWithReturnStatement.java");
+            doTest(fileName);
         }
         
         @TestMetadata("open.java")
         public void testOpen() throws Exception {
-            doTest("j2k/tests/testData/ast/function/open.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/open.java");
+            doTest(fileName);
         }
         
         @TestMetadata("override.java")
         public void testOverride() throws Exception {
-            doTest("j2k/tests/testData/ast/function/override.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/override.java");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideAndOpen.java")
         public void testOverrideAndOpen() throws Exception {
-            doTest("j2k/tests/testData/ast/function/overrideAndOpen.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideAndOpen.java");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideObject.java")
         public void testOverrideObject() throws Exception {
-            doTest("j2k/tests/testData/ast/function/overrideObject.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject.java");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideObject2.java")
         public void testOverrideObject2() throws Exception {
-            doTest("j2k/tests/testData/ast/function/overrideObject2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("overrideObject3.java")
         public void testOverrideObject3() throws Exception {
-            doTest("j2k/tests/testData/ast/function/overrideObject3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/overrideObject3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ownGenericParam.java")
         public void testOwnGenericParam() throws Exception {
-            doTest("j2k/tests/testData/ast/function/ownGenericParam.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownGenericParam.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ownSeveralGenericParams.java")
         public void testOwnSeveralGenericParams() throws Exception {
-            doTest("j2k/tests/testData/ast/function/ownSeveralGenericParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/ownSeveralGenericParams.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parameterModification.java")
         public void testParameterModification() throws Exception {
-            doTest("j2k/tests/testData/ast/function/parameterModification.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/parameterModification.java");
+            doTest(fileName);
         }
         
         @TestMetadata("private.java")
         public void testPrivate() throws Exception {
-            doTest("j2k/tests/testData/ast/function/private.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/private.java");
+            doTest(fileName);
         }
         
         @TestMetadata("protected.java")
         public void testProtected() throws Exception {
-            doTest("j2k/tests/testData/ast/function/protected.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/protected.java");
+            doTest(fileName);
         }
         
         @TestMetadata("public.java")
         public void testPublic() throws Exception {
-            doTest("j2k/tests/testData/ast/function/public.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/public.java");
+            doTest(fileName);
         }
         
         @TestMetadata("synchronizedMethod.java")
         public void testSynchronizedMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/function/synchronizedMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/synchronizedMethod.java");
+            doTest(fileName);
         }
         
         @TestMetadata("throws.java")
         public void testThrows() throws Exception {
-            doTest("j2k/tests/testData/ast/function/throws.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/throws.java");
+            doTest(fileName);
         }
         
         @TestMetadata("varVararg.java")
         public void testVarVararg() throws Exception {
-            doTest("j2k/tests/testData/ast/function/varVararg.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/function/varVararg.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/identifier")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Identifier extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIdentifier() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1593,22 +1890,26 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("finalFieldReference.java")
         public void testFinalFieldReference() throws Exception {
-            doTest("j2k/tests/testData/ast/identifier/finalFieldReference.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/finalFieldReference.java");
+            doTest(fileName);
         }
         
         @TestMetadata("keywords.java")
         public void testKeywords() throws Exception {
-            doTest("j2k/tests/testData/ast/identifier/keywords.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/keywords.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withDollar.java")
         public void testWithDollar() throws Exception {
-            doTest("j2k/tests/testData/ast/identifier/withDollar.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/identifier/withDollar.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/ifStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IfStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIfStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1616,37 +1917,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("elseIf.java")
         public void testElseIf() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/elseIf.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/elseIf.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiLine.java")
         public void testMultiLine() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/multiLine.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/multiLine.java");
+            doTest(fileName);
         }
         
         @TestMetadata("singleLine.java")
         public void testSingleLine() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/singleLine.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/singleLine.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withBlocks.java")
         public void testWithBlocks() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/withBlocks.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withBlocks.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withEmptyBlocks.java")
         public void testWithEmptyBlocks() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java");
+            doTest(fileName);
         }
         
         @TestMetadata("withoutElse.java")
         public void testWithoutElse() throws Exception {
-            doTest("j2k/tests/testData/ast/ifStatement/withoutElse.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/ifStatement/withoutElse.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/importStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ImportStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInImportStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1654,32 +1962,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("importWithKeywords.java")
         public void testImportWithKeywords() throws Exception {
-            doTest("j2k/tests/testData/ast/importStatement/importWithKeywords.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithKeywords.java");
+            doTest(fileName);
         }
         
         @TestMetadata("importWithStar.java")
         public void testImportWithStar() throws Exception {
-            doTest("j2k/tests/testData/ast/importStatement/importWithStar.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/importWithStar.java");
+            doTest(fileName);
         }
         
         @TestMetadata("oneImport.java")
         public void testOneImport() throws Exception {
-            doTest("j2k/tests/testData/ast/importStatement/oneImport.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/oneImport.java");
+            doTest(fileName);
         }
         
         @TestMetadata("onlyImports.java")
         public void testOnlyImports() throws Exception {
-            doTest("j2k/tests/testData/ast/importStatement/onlyImports.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/onlyImports.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleImport.java")
         public void testSimpleImport() throws Exception {
-            doTest("j2k/tests/testData/ast/importStatement/simpleImport.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/importStatement/simpleImport.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/inProjectionType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class InProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInInProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1687,12 +2001,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("methodParams.java")
         public void testMethodParams() throws Exception {
-            doTest("j2k/tests/testData/ast/inProjectionType/methodParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inProjectionType/methodParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/inheritance")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Inheritance extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInInheritance() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1700,27 +2016,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classOneExtendsBaseGeneric.java")
         public void testClassOneExtendsBaseGeneric() throws Exception {
-            doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classOneExtendsBaseWithOneParam.java")
         public void testClassOneExtendsBaseWithOneParam() throws Exception {
-            doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classOneExtendsBaseWithZeroParams.java")
         public void testClassOneExtendsBaseWithZeroParams() throws Exception {
-            doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java")
         public void testClassOneExtendsBaseWithZeroParamsNonEmptyConstructor() throws Exception {
-            doTest("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/isOperator")
+    @TestDataPath("$PROJECT_ROOT")
     public static class IsOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIsOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1728,17 +2049,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("complicatedExpression.java")
         public void testComplicatedExpression() throws Exception {
-            doTest("j2k/tests/testData/ast/isOperator/complicatedExpression.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/complicatedExpression.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleReference.java")
         public void testSimpleReference() throws Exception {
-            doTest("j2k/tests/testData/ast/isOperator/simpleReference.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/isOperator/simpleReference.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/issues")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Issues extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInIssues() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1746,192 +2070,230 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("arrayLength.java")
         public void testArrayLength() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/arrayLength.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/arrayLength.java");
+            doTest(fileName);
         }
         
         @TestMetadata("comments.java")
         public void testComments() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/comments.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/comments.java");
+            doTest(fileName);
         }
         
         @TestMetadata("doNotQualifyStatic.java")
         public void testDoNotQualifyStatic() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/doNotQualifyStatic.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/doNotQualifyStatic.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-1016.java")
         public void testKt_1016() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-1016.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1016.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-1048.java")
         public void testKt_1048() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-1048.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1048.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-1074.java")
         public void testKt_1074() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-1074.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-1074.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-5294.java")
         public void testKt_5294() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-5294.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5294.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-5400.java")
         public void testKt_5400() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-5400.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-5400.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-543.java")
         public void testKt_543() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-543.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-543-boxed.java")
         public void testKt_543_boxed() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-543-boxed.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-boxed.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-543-mixed.java")
         public void testKt_543_mixed() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-543-mixed.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-543-mixed.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-638.java")
         public void testKt_638() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-638.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-638.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-696.java")
         public void testKt_696() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-696.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-696.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-792.java")
         public void testKt_792() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-792.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-792-mixed.java")
         public void testKt_792_mixed() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-792-mixed.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-792-mixed.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-794.java")
         public void testKt_794() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-794.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-794-mixed.java")
         public void testKt_794_mixed() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-794-mixed.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-794-mixed.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-807.java")
         public void testKt_807() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-807.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-807.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-809.java")
         public void testKt_809() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-809.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-809-string.java")
         public void testKt_809_string() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-809-string.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-809-string.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-820.java")
         public void testKt_820() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-820.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-820-field.java")
         public void testKt_820_field() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-820-field.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-field.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-820-string.java")
         public void testKt_820_string() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-820-string.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-820-string.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-824.java")
         public void testKt_824() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-824.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-824-isDir.java")
         public void testKt_824_isDir() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-824-isDir.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-824-isDir.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-828.java")
         public void testKt_828() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-828.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-828.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-836.java")
         public void testKt_836() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-836.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-836.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-837.java")
         public void testKt_837() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-837.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-837.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-851.java")
         public void testKt_851() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-851.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-851.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-852.java")
         public void testKt_852() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-852.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-852.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-871.java")
         public void testKt_871() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-871.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-871.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-879.java")
         public void testKt_879() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-879.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-879.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-893.java")
         public void testKt_893() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-893.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-893.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-899.java")
         public void testKt_899() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-899.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-899.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-963.java")
         public void testKt_963() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/kt-963.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/kt-963.java");
+            doTest(fileName);
         }
         
         @TestMetadata("qualifyStatic.java")
         public void testQualifyStatic() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/qualifyStatic.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/qualifyStatic.java");
+            doTest(fileName);
         }
         
         @TestMetadata("spaceBeforeAssignment.java")
         public void testSpaceBeforeAssignment() throws Exception {
-            doTest("j2k/tests/testData/ast/issues/spaceBeforeAssignment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/issues/spaceBeforeAssignment.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/kotlinApiAccess")
+    @TestDataPath("$PROJECT_ROOT")
     public static class KotlinApiAccess extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInKotlinApiAccess() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true);
@@ -1939,72 +2301,86 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("ClassObjectMembers.java")
         public void testClassObjectMembers() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ClassObjectMembers.java");
+            doTest(fileName);
         }
         
         @TestMetadata("CorrectFunNullabilityDetected.java")
         public void testCorrectFunNullabilityDetected() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectFunNullabilityDetected.java");
+            doTest(fileName);
         }
         
         @TestMetadata("CorrectNullabilityDetected.java")
         public void testCorrectNullabilityDetected() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/CorrectNullabilityDetected.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionFunction.java")
         public void testExtensionFunction() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionFunction.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ExtensionProperty.java")
         public void testExtensionProperty() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ExtensionProperty.java");
+            doTest(fileName);
         }
         
         @TestMetadata("GlobalFunction.java")
         public void testGlobalFunction() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalFunction.java");
+            doTest(fileName);
         }
         
         @TestMetadata("GlobalGenericFunction.java")
         public void testGlobalGenericFunction() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalGenericFunction.java");
+            doTest(fileName);
         }
         
         @TestMetadata("GlobalValue1.java")
         public void testGlobalValue1() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("GlobalValue2.java")
         public void testGlobalValue2() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/GlobalValue2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("InheritedProperty.java")
         public void testInheritedProperty() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/InheritedProperty.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ObjectMembers.java")
         public void testObjectMembers() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/ObjectMembers.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Property.java")
         public void testProperty() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/Property.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Property2.java")
         public void testProperty2() throws Exception {
-            doTest("j2k/tests/testData/ast/kotlinApiAccess/Property2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/kotlinApiAccess/Property2.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/labelStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LabelStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLabelStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2012,12 +2388,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("complicatedExampleFromJavaTutorial.java")
         public void testComplicatedExampleFromJavaTutorial() throws Exception {
-            doTest("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/list")
+    @TestDataPath("$PROJECT_ROOT")
     public static class List extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInList() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2025,17 +2403,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("ForEach.java")
         public void testForEach() throws Exception {
-            doTest("j2k/tests/testData/ast/list/ForEach.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/ForEach.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Lists.java")
         public void testLists() throws Exception {
-            doTest("j2k/tests/testData/ast/list/Lists.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/list/Lists.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/literalExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LiteralExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLiteralExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2043,37 +2424,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("char.java")
         public void testChar() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/char.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/char.java");
+            doTest(fileName);
         }
         
         @TestMetadata("dollarInsideString.java")
         public void testDollarInsideString() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/dollarInsideString.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/dollarInsideString.java");
+            doTest(fileName);
         }
         
         @TestMetadata("endsWithDFL.java")
         public void testEndsWithDFL() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/endsWithDFL.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/endsWithDFL.java");
+            doTest(fileName);
         }
         
         @TestMetadata("hex.java")
         public void testHex() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/hex.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/hex.java");
+            doTest(fileName);
         }
         
         @TestMetadata("octal.java")
         public void testOctal() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/octal.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/octal.java");
+            doTest(fileName);
         }
         
         @TestMetadata("trueOrFalse.java")
         public void testTrueOrFalse() throws Exception {
-            doTest("j2k/tests/testData/ast/literalExpression/trueOrFalse.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/literalExpression/trueOrFalse.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/localVariable")
+    @TestDataPath("$PROJECT_ROOT")
     public static class LocalVariable extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInLocalVariable() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2081,52 +2469,62 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("autoBangBang.java")
         public void testAutoBangBang() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/autoBangBang.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/autoBangBang.java");
+            doTest(fileName);
         }
         
         @TestMetadata("conversion.java")
         public void testConversion() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/conversion.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/conversion.java");
+            doTest(fileName);
         }
         
         @TestMetadata("literalConversion.java")
         public void testLiteralConversion() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/literalConversion.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/literalConversion.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nullIInitializer.java")
         public void testNullIInitializer() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/nullIInitializer.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/nullIInitializer.java");
+            doTest(fileName);
         }
         
         @TestMetadata("object.java")
         public void testObject() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/object.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/object.java");
+            doTest(fileName);
         }
         
         @TestMetadata("unboxing.java")
         public void testUnboxing() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/unboxing.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/unboxing.java");
+            doTest(fileName);
         }
         
         @TestMetadata("valTypeDoNotMatch.java")
         public void testValTypeDoNotMatch() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/valTypeDoNotMatch.java");
+            doTest(fileName);
         }
         
         @TestMetadata("varTypeDoNotMatch.java")
         public void testVarTypeDoNotMatch() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varTypeDoNotMatch.java");
+            doTest(fileName);
         }
         
         @TestMetadata("varWithNoInitializer.java")
         public void testVarWithNoInitializer() throws Exception {
-            doTest("j2k/tests/testData/ast/localVariable/varWithNoInitializer.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/localVariable/varWithNoInitializer.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/methodCallExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class MethodCallExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInMethodCallExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2134,47 +2532,56 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("callWithKeywords.java")
         public void testCallWithKeywords() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/callWithKeywords.java");
+            doTest(fileName);
         }
         
         @TestMetadata("collectionsMethods.java")
         public void testCollectionsMethods() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/collectionsMethods.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyCall.java")
         public void testEmptyCall() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/emptyCall.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/emptyCall.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericMethod.java")
         public void testGenericMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/genericMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/genericMethod.java");
+            doTest(fileName);
         }
         
         @TestMetadata("getClass.java")
         public void testGetClass() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/getClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/getClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleCall.java")
         public void testSimpleCall() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/simpleCall.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/simpleCall.java");
+            doTest(fileName);
         }
         
         @TestMetadata("vararg1.java")
         public void testVararg1() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/vararg1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("vararg2.java")
         public void testVararg2() throws Exception {
-            doTest("j2k/tests/testData/ast/methodCallExpression/vararg2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/methodCallExpression/vararg2.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/misc")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Misc extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInMisc() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2182,37 +2589,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("packageWithClass.java")
         public void testPackageWithClass() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("packageWithClasses.java")
         public void testPackageWithClasses() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithClasses.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithClasses.java");
+            doTest(fileName);
         }
         
         @TestMetadata("packageWithImports.java")
         public void testPackageWithImports() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithImports.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithImports.java");
+            doTest(fileName);
         }
         
         @TestMetadata("packageWithMixedImports.java")
         public void testPackageWithMixedImports() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithMixedImports.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithMixedImports.java");
+            doTest(fileName);
         }
         
         @TestMetadata("packageWithOpenClass.java")
         public void testPackageWithOpenClass() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithOpenClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithOpenClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("packageWithStaticImports.java")
         public void testPackageWithStaticImports() throws Exception {
-            doTest("j2k/tests/testData/ast/misc/packageWithStaticImports.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/misc/packageWithStaticImports.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/newClassExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class NewClassExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInNewClassExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2220,72 +2634,86 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classWithParam.java")
         public void testClassWithParam() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/classWithParam.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParam.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classWithParams.java")
         public void testClassWithParams() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/classWithParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithParams.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classWithoutBody.java")
         public void testClassWithoutBody() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/classWithoutBody.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/classWithoutBody.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fullQualifiedName.java")
         public void testFullQualifiedName() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fullQualifiedName2.java")
         public void testFullQualifiedName2() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericClassInvocation.java")
         public void testGenericClassInvocation() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/genericClassInvocation.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newAnonymousClass.java")
         public void testNewAnonymousClass() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newAnonymousClass2.java")
         public void testNewAnonymousClass2() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newAnonymousClass3.java")
         public void testNewAnonymousClass3() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newAnonymousClass3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newClassByFullName.java")
         public void testNewClassByFullName() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newClassByFullName.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newClassByFullName.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newInnerClass.java")
         public void testNewInnerClass() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newInnerClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newInnerClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newListAndNewMember.java")
         public void testNewListAndNewMember() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newListAndNewMember.java");
+            doTest(fileName);
         }
         
         @TestMetadata("newStaticInnerClass.java")
         public void testNewStaticInnerClass() throws Exception {
-            doTest("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/nullability")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Nullability extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInNullability() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/nullability"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2293,157 +2721,188 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("autoNotNull.java")
         public void testAutoNotNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/autoNotNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/autoNotNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldAssignedWithNull.java")
         public void testFieldAssignedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldAssignedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldComparedWithNull.java")
         public void testFieldComparedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldComparedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldComparedWithNull2.java")
         public void testFieldComparedWithNull2() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldComparedWithNull3.java")
         public void testFieldComparedWithNull3() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldComparedWithNull4.java")
         public void testFieldComparedWithNull4() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldComparedWithNull4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("FieldInitializedWithNull.java")
         public void testFieldInitializedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/FieldInitializedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("IndirectOverride.java")
         public void testIndirectOverride() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/IndirectOverride.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/IndirectOverride.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodInvokedWithNullArg.java")
         public void testMethodInvokedWithNullArg() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodInvokedWithNullArg2.java")
         public void testMethodInvokedWithNullArg2() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithNullArg2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodInvokedWithTernaryNullArg.java")
         public void testMethodInvokedWithTernaryNullArg() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodResultComparedWithNull.java")
         public void testMethodResultComparedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodResultComparedWithNull2.java")
         public void testMethodResultComparedWithNull2() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodResultComparedWithNull3.java")
         public void testMethodResultComparedWithNull3() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodResultComparedWithNull4.java")
         public void testMethodResultComparedWithNull4() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodResultInitializesNullableField.java")
         public void testMethodResultInitializesNullableField() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodResultInitializesNullableField.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodReturnsNull.java")
         public void testMethodReturnsNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodReturnsNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodReturnsNullInAnonymousClass.java")
         public void testMethodReturnsNullInAnonymousClass() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInAnonymousClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodReturnsNullInLocalClass.java")
         public void testMethodReturnsNullInLocalClass() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsNullInLocalClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MethodReturnsTernaryNull.java")
         public void testMethodReturnsTernaryNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableIntNoCrash.java")
         public void testNullableIntNoCrash() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/NullableIntNoCrash.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableIntNoCrash.java");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableMethodDotAccess.java")
         public void testNullableMethodDotAccess() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableMethodDotAccess.java");
+            doTest(fileName);
         }
         
         @TestMetadata("NullableVariableDotAccess.java")
         public void testNullableVariableDotAccess() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/NullableVariableDotAccess.java");
+            doTest(fileName);
         }
         
         @TestMetadata("OverrideWithInheritanceLoop.java")
         public void testOverrideWithInheritanceLoop() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/OverrideWithInheritanceLoop.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Overrides.java")
         public void testOverrides() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/Overrides.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/Overrides.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ParameterComparedWithNull.java")
         public void testParameterComparedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/ParameterComparedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableAssignedWithNull.java")
         public void testVariableAssignedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableAssignedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableComparedWithNull.java")
         public void testVariableComparedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/VariableComparedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableComparedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableInitializedWithNull.java")
         public void testVariableInitializedWithNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithNull.java");
+            doTest(fileName);
         }
         
         @TestMetadata("VariableInitializedWithTernaryNull.java")
         public void testVariableInitializedWithTernaryNull() throws Exception {
-            doTest("j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/objectLiteral")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ObjectLiteral extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInObjectLiteral() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2451,12 +2910,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("MyFrame.java")
         public void testMyFrame() throws Exception {
-            doTest("j2k/tests/testData/ast/objectLiteral/MyFrame.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/objectLiteral/MyFrame.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/outProjectionType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class OutProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInOutProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2464,12 +2925,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("methodParams.java")
         public void testMethodParams() throws Exception {
-            doTest("j2k/tests/testData/ast/outProjectionType/methodParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/outProjectionType/methodParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/packageStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PackageStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPackageStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2477,12 +2940,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("orgJetbrainsJetJ2kIn.java")
         public void testOrgJetbrainsJetJ2kIn() throws Exception {
-            doTest("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInParenthesizedExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2490,17 +2955,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("parenthesized.java")
         public void testParenthesized() throws Exception {
-            doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized.java");
+            doTest(fileName);
         }
         
         @TestMetadata("parenthesized2.java")
         public void testParenthesized2() throws Exception {
-            doTest("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/parenthesizedExpression/parenthesized2.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/polyadicExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PolyadicExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPolyadicExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2508,37 +2976,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("divide.java")
         public void testDivide() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/divide.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/divide.java");
+            doTest(fileName);
         }
         
         @TestMetadata("minus.java")
         public void testMinus() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/minus.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/minus.java");
+            doTest(fileName);
         }
         
         @TestMetadata("multiply.java")
         public void testMultiply() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/multiply.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/multiply.java");
+            doTest(fileName);
         }
         
         @TestMetadata("plus.java")
         public void testPlus() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/plus.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/plus.java");
+            doTest(fileName);
         }
         
         @TestMetadata("remainder.java")
         public void testRemainder() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/remainder.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/remainder.java");
+            doTest(fileName);
         }
         
         @TestMetadata("unassignedShiftRight.java")
         public void testUnassignedShiftRight() throws Exception {
-            doTest("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/polyadicExpression/unassignedShiftRight.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/postfixOperator")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PostfixOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPostfixOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2546,17 +3021,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("decrement.java")
         public void testDecrement() throws Exception {
-            doTest("j2k/tests/testData/ast/postfixOperator/decrement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/decrement.java");
+            doTest(fileName);
         }
         
         @TestMetadata("increment.java")
         public void testIncrement() throws Exception {
-            doTest("j2k/tests/testData/ast/postfixOperator/increment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/postfixOperator/increment.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/prefixOperator")
+    @TestDataPath("$PROJECT_ROOT")
     public static class PrefixOperator extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInPrefixOperator() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2564,37 +3042,44 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("decrement.java")
         public void testDecrement() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/decrement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/decrement.java");
+            doTest(fileName);
         }
         
         @TestMetadata("excl.java")
         public void testExcl() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/excl.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/excl.java");
+            doTest(fileName);
         }
         
         @TestMetadata("increment.java")
         public void testIncrement() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/increment.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/increment.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-667.java")
         public void testKt_667() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/kt-667.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/kt-667.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nullableIf.java")
         public void testNullableIf() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/nullableIf.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/nullableIf.java");
+            doTest(fileName);
         }
         
         @TestMetadata("tilde.java")
         public void testTilde() throws Exception {
-            doTest("j2k/tests/testData/ast/prefixOperator/tilde.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/prefixOperator/tilde.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/rawGenerics")
+    @TestDataPath("$PROJECT_ROOT")
     public static class RawGenerics extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInRawGenerics() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2602,27 +3087,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("kt-540.java")
         public void testKt_540() throws Exception {
-            doTest("j2k/tests/testData/ast/rawGenerics/kt-540.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-540-map.java")
         public void testKt_540_map() throws Exception {
-            doTest("j2k/tests/testData/ast/rawGenerics/kt-540-map.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-map.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-540-rawGenericClass.java")
         public void testKt_540_rawGenericClass() throws Exception {
-            doTest("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("rawGenericMethod.java")
         public void testRawGenericMethod() throws Exception {
-            doTest("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/rawGenerics/rawGenericMethod.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/returnStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ReturnStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInReturnStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2630,32 +3120,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("currentMethodBug.java")
         public void testCurrentMethodBug() throws Exception {
-            doTest("j2k/tests/testData/ast/returnStatement/currentMethodBug.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/currentMethodBug.java");
+            doTest(fileName);
         }
         
         @TestMetadata("returnChar.java")
         public void testReturnChar() throws Exception {
-            doTest("j2k/tests/testData/ast/returnStatement/returnChar.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnChar.java");
+            doTest(fileName);
         }
         
         @TestMetadata("returnLiteral.java")
         public void testReturnLiteral() throws Exception {
-            doTest("j2k/tests/testData/ast/returnStatement/returnLiteral.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnLiteral.java");
+            doTest(fileName);
         }
         
         @TestMetadata("returnNumber.java")
         public void testReturnNumber() throws Exception {
-            doTest("j2k/tests/testData/ast/returnStatement/returnNumber.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnNumber.java");
+            doTest(fileName);
         }
         
         @TestMetadata("returnString.java")
         public void testReturnString() throws Exception {
-            doTest("j2k/tests/testData/ast/returnStatement/returnString.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/returnStatement/returnString.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/settings")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Settings extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSettings() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/settings"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2663,27 +3159,32 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("openByDefault.java")
         public void testOpenByDefault() throws Exception {
-            doTest("j2k/tests/testData/ast/settings/openByDefault.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/openByDefault.java");
+            doTest(fileName);
         }
         
         @TestMetadata("specifyFieldTypeByDefault.java")
         public void testSpecifyFieldTypeByDefault() throws Exception {
-            doTest("j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyFieldTypeByDefault.java");
+            doTest(fileName);
         }
         
         @TestMetadata("specifyLocalVariableTypeByDefault.java")
         public void testSpecifyLocalVariableTypeByDefault() throws Exception {
-            doTest("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefault.java");
+            doTest(fileName);
         }
         
         @TestMetadata("specifyLocalVariableTypeByDefaultInFor.java")
         public void testSpecifyLocalVariableTypeByDefaultInFor() throws Exception {
-            doTest("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/settings/specifyLocalVariableTypeByDefaultInFor.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/starProjectionType")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StarProjectionType extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInStarProjectionType() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2691,12 +3192,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("methodParams.java")
         public void testMethodParams() throws Exception {
-            doTest("j2k/tests/testData/ast/starProjectionType/methodParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/starProjectionType/methodParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/staticMembers")
+    @TestDataPath("$PROJECT_ROOT")
     public static class StaticMembers extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInStaticMembers() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/staticMembers"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2704,32 +3207,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("PrivateStaticMembers.java")
         public void testPrivateStaticMembers() throws Exception {
-            doTest("j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMembers.java");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateStaticMethods1.java")
         public void testPrivateStaticMethods1() throws Exception {
-            doTest("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods1.java");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateStaticMethods2.java")
         public void testPrivateStaticMethods2() throws Exception {
-            doTest("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateStaticMethods3.java")
         public void testPrivateStaticMethods3() throws Exception {
-            doTest("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("PrivateStaticMethods4.java")
         public void testPrivateStaticMethods4() throws Exception {
-            doTest("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/staticMembers/PrivateStaticMethods4.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/superExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SuperExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSuperExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2737,22 +3246,26 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classAdotSuperFoo.java")
         public void testClassAdotSuperFoo() throws Exception {
-            doTest("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAdotSuperFoo.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classAextendsB.java")
         public void testClassAextendsB() throws Exception {
-            doTest("j2k/tests/testData/ast/superExpression/classAextendsB.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/classAextendsB.java");
+            doTest(fileName);
         }
         
         @TestMetadata("superStatement.java")
         public void testSuperStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/superExpression/superStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/superExpression/superStatement.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/switch")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Switch extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSwitch() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2760,62 +3273,74 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("caseWithBlock.java")
         public void testCaseWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/caseWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/caseWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("comlicatedFallDown.java")
         public void testComlicatedFallDown() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/comlicatedFallDown.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/comlicatedFallDown.java");
+            doTest(fileName);
         }
         
         @TestMetadata("continueAndBreakWithLabel.java")
         public void testContinueAndBreakWithLabel() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/continueAndBreakWithLabel.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptySwitch.java")
         public void testEmptySwitch() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/emptySwitch.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/emptySwitch.java");
+            doTest(fileName);
         }
         
         @TestMetadata("enumConstants.java")
         public void testEnumConstants() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/enumConstants.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/enumConstants.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fallDown.java")
         public void testFallDown() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/fallDown.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDown.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fallDownWithBlocks.java")
         public void testFallDownWithBlocks() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/fallDownWithBlocks.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/fallDownWithBlocks.java");
+            doTest(fileName);
         }
         
         @TestMetadata("invalidSwitch.java")
         public void testInvalidSwitch() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/invalidSwitch.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/invalidSwitch.java");
+            doTest(fileName);
         }
         
         @TestMetadata("kt-539.java")
         public void testKt_539() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/kt-539.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/kt-539.java");
+            doTest(fileName);
         }
         
         @TestMetadata("nondefault.java")
         public void testNondefault() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/nondefault.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/nondefault.java");
+            doTest(fileName);
         }
         
         @TestMetadata("returnsAndThrows.java")
         public void testReturnsAndThrows() throws Exception {
-            doTest("j2k/tests/testData/ast/switch/returnsAndThrows.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/switch/returnsAndThrows.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/synchronizedStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class SynchronizedStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInSynchronizedStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2823,12 +3348,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("singleLineExample.java")
         public void testSingleLineExample() throws Exception {
-            doTest("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/synchronizedStatement/singleLineExample.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/thisExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ThisExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInThisExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2836,17 +3363,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classAdotThisFoo.java")
         public void testClassAdotThisFoo() throws Exception {
-            doTest("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/classAdotThisFoo.java");
+            doTest(fileName);
         }
         
         @TestMetadata("thisStatement.java")
         public void testThisStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/thisExpression/thisStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/thisExpression/thisStatement.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/throwStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ThrowStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInThrowStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2854,12 +3384,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("simpleThrowStatement.java")
         public void testSimpleThrowStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/throwStatement/simpleThrowStatement.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/toKotlinClasses")
+    @TestDataPath("$PROJECT_ROOT")
     public static class ToKotlinClasses extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInToKotlinClasses() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2867,31 +3399,37 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("iterableAndIterator.java")
         public void testIterableAndIterator() throws Exception {
-            doTest("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator.java");
+            doTest(fileName);
         }
         
         @TestMetadata("iterableAndIterator2.java")
         public void testIterableAndIterator2() throws Exception {
-            doTest("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator2.java");
+            doTest(fileName);
         }
         
         @TestMetadata("iterableAndIterator3.java")
         public void testIterableAndIterator3() throws Exception {
-            doTest("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/iterableAndIterator3.java");
+            doTest(fileName);
         }
         
         @TestMetadata("TypeParameterBound.java")
         public void testTypeParameterBound() throws Exception {
-            doTest("j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/toKotlinClasses/TypeParameterBound.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/trait")
+    @TestDataPath("$PROJECT_ROOT")
     public static class Trait extends AbstractJavaToKotlinConverterTest {
         @TestMetadata("abstactInterface.java")
         public void testAbstactInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/abstactInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/abstactInterface.java");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInTrait() throws Exception {
@@ -2900,57 +3438,68 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("emptyInterface.java")
         public void testEmptyInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/emptyInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/emptyInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("extendsOneClassAndImplementsSeveralInterfaces.java")
         public void testExtendsOneClassAndImplementsSeveralInterfaces() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.java");
+            doTest(fileName);
         }
         
         @TestMetadata("extendsOneInterface.java")
         public void testExtendsOneInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/extendsOneInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/extendsOneInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("interfaceWithFields.java")
         public void testInterfaceWithFields() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/interfaceWithFields.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithFields.java");
+            doTest(fileName);
         }
         
         @TestMetadata("interfaceWithMethodDeclaration.java")
         public void testInterfaceWithMethodDeclaration() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.java");
+            doTest(fileName);
         }
         
         @TestMetadata("interfaceWithStaticFields.java")
         public void testInterfaceWithStaticFields() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/interfaceWithStaticFields.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/interfaceWithStaticFields.java");
+            doTest(fileName);
         }
         
         @TestMetadata("internalInterface.java")
         public void testInternalInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/internalInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/internalInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("privateInterface.java")
         public void testPrivateInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/privateInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/privateInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("protectedInterface.java")
         public void testProtectedInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/protectedInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/protectedInterface.java");
+            doTest(fileName);
         }
         
         @TestMetadata("publicInterface.java")
         public void testPublicInterface() throws Exception {
-            doTest("j2k/tests/testData/ast/trait/publicInterface.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/trait/publicInterface.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/tryStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTryStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2958,32 +3507,38 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("commonCaseForTryStatement.java")
         public void testCommonCaseForTryStatement() throws Exception {
-            doTest("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.java");
+            doTest(fileName);
         }
         
         @TestMetadata("disjunctionType.java")
         public void testDisjunctionType() throws Exception {
-            doTest("j2k/tests/testData/ast/tryStatement/disjunctionType.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/disjunctionType.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyTryWithTwoCatchesWithEmptyFinally.java")
         public void testEmptyTryWithTwoCatchesWithEmptyFinally() throws Exception {
-            doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyTryWithTwoCatchesWithFinally.java")
         public void testEmptyTryWithTwoCatchesWithFinally() throws Exception {
-            doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.java");
+            doTest(fileName);
         }
         
         @TestMetadata("emptyTryWithTwoCatchesWithoutFinally.java")
         public void testEmptyTryWithTwoCatchesWithoutFinally() throws Exception {
-            doTest("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/tryWithResource")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TryWithResource extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTryWithResource() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true);
@@ -2991,57 +3546,68 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("Multiline.java")
         public void testMultiline() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/Multiline.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Multiline.java");
+            doTest(fileName);
         }
         
         @TestMetadata("MultipleResources.java")
         public void testMultipleResources() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/MultipleResources.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/MultipleResources.java");
+            doTest(fileName);
         }
         
         @TestMetadata("Simple.java")
         public void testSimple() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/Simple.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/Simple.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithCatch.java")
         public void testWithCatch() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithCatch.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatch.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithCatchAndFinally.java")
         public void testWithCatchAndFinally() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatchAndFinally.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithCatches.java")
         public void testWithCatches() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithCatches.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithCatches.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithFinally.java")
         public void testWithFinally() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithFinally.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithFinally.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithReturnAtEnd.java")
         public void testWithReturnAtEnd() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnAtEnd.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithReturnInAnonymousClass.java")
         public void testWithReturnInAnonymousClass() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("WithReturnInAnonymousClass2.java")
         public void testWithReturnInAnonymousClass2() throws Exception {
-            doTest("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/tryWithResource/WithReturnInAnonymousClass2.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/typeCastExpression")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeCastExpression extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTypeCastExpression() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true);
@@ -3049,47 +3615,56 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("extendsWildcardCast.java")
         public void testExtendsWildcardCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/extendsWildcardCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("fooCast.java")
         public void testFooCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/fooCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/fooCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("intCast.java")
         public void testIntCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/intCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/intCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("primitiveType.java")
         public void testPrimitiveType() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/primitiveType.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/primitiveType.java");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleGenericCast.java")
         public void testSimpleGenericCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/simpleGenericCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("stringCast.java")
         public void testStringCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/stringCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/stringCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("superWildcardCast.java")
         public void testSuperWildcardCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/superWildcardCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("wildcardCast.java")
         public void testWildcardCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeCastExpression/wildcardCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeCastExpression/wildcardCast.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/typeParameters")
+    @TestDataPath("$PROJECT_ROOT")
     public static class TypeParameters extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInTypeParameters() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.java$"), true);
@@ -3097,82 +3672,98 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("classDoubleParametrizationWithTwoBoundsWithExtending.java")
         public void testClassDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classParametrizationWithTwoBounds.java")
         public void testClassParametrizationWithTwoBounds() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.java");
+            doTest(fileName);
         }
         
         @TestMetadata("classParametrizationWithTwoBoundsWithExtending.java")
         public void testClassParametrizationWithTwoBoundsWithExtending() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.java");
+            doTest(fileName);
         }
         
         @TestMetadata("complexExampleWithClassExtending.java")
         public void testComplexExampleWithClassExtending() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.java");
+            doTest(fileName);
         }
         
         @TestMetadata("complexExampleWithClassMultiplyExtending.java")
         public void testComplexExampleWithClassMultiplyExtending() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericClass.java")
         public void testGenericClass() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/genericClass.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericClass.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericParam.java")
         public void testGenericParam() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/genericParam.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam.java");
+            doTest(fileName);
         }
         
         @TestMetadata("genericParam-settings.java")
         public void testGenericParam_settings() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/genericParam-settings.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/genericParam-settings.java");
+            doTest(fileName);
         }
         
         @TestMetadata("manyGenericParams.java")
         public void testManyGenericParams() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/manyGenericParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/manyGenericParams.java");
+            doTest(fileName);
         }
         
         @TestMetadata("methodDoubleParametrizationWithTwoBounds.java")
         public void testMethodDoubleParametrizationWithTwoBounds() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.java");
+            doTest(fileName);
         }
         
         @TestMetadata("needTypeArgs.java")
         public void testNeedTypeArgs() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/needTypeArgs.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/needTypeArgs.java");
+            doTest(fileName);
         }
         
         @TestMetadata("rawTypeCast.java")
         public void testRawTypeCast() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/rawTypeCast.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/rawTypeCast.java");
+            doTest(fileName);
         }
         
         @TestMetadata("traitDoubleParametrizationWithTwoBoundsWithExtending.java")
         public void testTraitDoubleParametrizationWithTwoBoundsWithExtending() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.java");
+            doTest(fileName);
         }
         
         @TestMetadata("typeFromOtherFile.java")
         public void testTypeFromOtherFile() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/typeFromOtherFile.java");
+            doTest(fileName);
         }
         
         @TestMetadata("where.java")
         public void testWhere() throws Exception {
-            doTest("j2k/tests/testData/ast/typeParameters/where.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/typeParameters/where.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/varArg")
+    @TestDataPath("$PROJECT_ROOT")
     public static class VarArg extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInVarArg() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.java$"), true);
@@ -3180,17 +3771,20 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("ellipsisTypeSeveralParams.java")
         public void testEllipsisTypeSeveralParams() throws Exception {
-            doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.java");
+            doTest(fileName);
         }
         
         @TestMetadata("ellipsisTypeSingleParams.java")
         public void testEllipsisTypeSingleParams() throws Exception {
-            doTest("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.java");
+            doTest(fileName);
         }
         
     }
     
     @TestMetadata("j2k/tests/testData/ast/whileStatement")
+    @TestDataPath("$PROJECT_ROOT")
     public static class WhileStatement extends AbstractJavaToKotlinConverterTest {
         public void testAllFilesPresentInWhileStatement() throws Exception {
             JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.java$"), true);
@@ -3198,22 +3792,26 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv
         
         @TestMetadata("whileWithBlock.java")
         public void testWhileWithBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/whileStatement/whileWithBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithEmptyBlock.java")
         public void testWhileWithEmptyBlock() throws Exception {
-            doTest("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithExpression.java")
         public void testWhileWithExpression() throws Exception {
-            doTest("j2k/tests/testData/ast/whileStatement/whileWithExpression.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithExpression.java");
+            doTest(fileName);
         }
         
         @TestMetadata("whileWithReturn.java")
         public void testWhileWithReturn() throws Exception {
-            doTest("j2k/tests/testData/ast/whileStatement/whileWithReturn.java");
+            String fileName = JetTestUtils.navigationMetadata("j2k/tests/testData/ast/whileStatement/whileWithReturn.java");
+            doTest(fileName);
         }
         
     }
diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index 3a7765cdeaa..4e0ca0824ac 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.jps.build;
 
+import com.intellij.testFramework.TestDataPath;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.jetbrains.jet.JetTestUtils;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("jps-plugin/testData/incremental")
+@TestDataPath("$PROJECT_ROOT")
 @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class})
 public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     public void testAllFilesPresentInIncremental() throws Exception {
@@ -35,6 +37,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     }
     
     @TestMetadata("jps-plugin/testData/incremental/circularDependency")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class CircularDependency extends AbstractIncrementalJpsTest {
         public void testAllFilesPresentInCircularDependency() throws Exception {
@@ -43,7 +46,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         
         @TestMetadata("simple")
         public void testSimple() throws Exception {
-            doTest("jps-plugin/testData/incremental/circularDependency/simple/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {
@@ -54,21 +58,25 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
     }
     
     @TestMetadata("jps-plugin/testData/incremental/pureKotlin")
+    @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     public static class PureKotlin extends AbstractIncrementalJpsTest {
         @TestMetadata("accessingFunctionsViaPackagePart")
         public void testAccessingFunctionsViaPackagePart() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/");
+            doTest(fileName);
         }
         
         @TestMetadata("accessingPropertiesViaField")
         public void testAccessingPropertiesViaField() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/");
+            doTest(fileName);
         }
         
         @TestMetadata("allConstants")
         public void testAllConstants() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/");
+            doTest(fileName);
         }
         
         public void testAllFilesPresentInPureKotlin() throws Exception {
@@ -77,172 +85,206 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         
         @TestMetadata("annotations")
         public void testAnnotations() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/annotations/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/");
+            doTest(fileName);
         }
         
         @TestMetadata("classInlineFunctionChanged")
         public void testClassInlineFunctionChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classObjectConstantChanged")
         public void testClassObjectConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classRecreated")
         public void testClassRecreated() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/");
+            doTest(fileName);
         }
         
         @TestMetadata("classSignatureChanged")
         public void testClassSignatureChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("classSignatureUnchanged")
         public void testClassSignatureUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("constantsUnchanged")
         public void testConstantsUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("defaultArguments")
         public void testDefaultArguments() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/defaultArguments/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/");
+            doTest(fileName);
         }
         
         @TestMetadata("dependencyClassReferenced")
         public void testDependencyClassReferenced() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/");
+            doTest(fileName);
         }
         
         @TestMetadata("filesExchangePackages")
         public void testFilesExchangePackages() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/");
+            doTest(fileName);
         }
         
         @TestMetadata("independentClasses")
         public void testIndependentClasses() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/");
+            doTest(fileName);
         }
         
         @TestMetadata("inlineFunctionsCircularDependency")
         public void testInlineFunctionsCircularDependency() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/");
+            doTest(fileName);
         }
         
         @TestMetadata("inlineFunctionsUnchanged")
         public void testInlineFunctionsUnchanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("multiplePackagesModified")
         public void testMultiplePackagesModified() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/");
+            doTest(fileName);
         }
         
         @TestMetadata("objectValChanged")
         public void testObjectValChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/objectValChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("ourClassReferenced")
         public void testOurClassReferenced() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageConstantChanged")
         public void testPackageConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileAdded")
         public void testPackageFileAdded() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileChangedPackage")
         public void testPackageFileChangedPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileChangedThenOtherRemoved")
         public void testPackageFileChangedThenOtherRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFileRemoved")
         public void testPackageFileRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageFilesChangedInTurn")
         public void testPackageFilesChangedInTurn() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionAccessingField")
         public void testPackageInlineFunctionAccessingField() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionChanged")
         public void testPackageInlineFunctionChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageInlineFunctionFromOurPackage")
         public void testPackageInlineFunctionFromOurPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRecreated")
         public void testPackageRecreated() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRecreatedAfterRenaming")
         public void testPackageRecreatedAfterRenaming() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/");
+            doTest(fileName);
         }
         
         @TestMetadata("packageRemoved")
         public void testPackageRemoved() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/");
+            doTest(fileName);
         }
         
         @TestMetadata("returnTypeChanged")
         public void testReturnTypeChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/");
+            doTest(fileName);
         }
         
         @TestMetadata("simpleClassDependency")
         public void testSimpleClassDependency() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/");
+            doTest(fileName);
         }
         
         @TestMetadata("soleFileChangesPackage")
         public void testSoleFileChangesPackage() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelFunctionSameSignature")
         public void testTopLevelFunctionSameSignature() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/");
+            doTest(fileName);
         }
         
         @TestMetadata("topLevelMembersInTwoFiles")
         public void testTopLevelMembersInTwoFiles() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/");
+            doTest(fileName);
         }
         
         @TestMetadata("traitClassObjectConstantChanged")
         public void testTraitClassObjectConstantChanged() throws Exception {
-            doTest("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/");
+            doTest(fileName);
         }
         
         public static Test innerSuite() {