diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt
index 96331ae26d8..c56d293dca2 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClass/baseClass.kt
@@ -8,8 +8,7 @@ fun Activity.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC
-// 2 INVOKEVIRTUAL
-// 2 CHECKCAST
-// 0  _\$_findCachedViewById
-// 2 findViewById
\ No newline at end of file
+// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 INVOKEVIRTUAL android/app/Activity\.findViewById
+// 2 CHECKCAST android/widget/Button
+// 0  _\$_findCachedViewById
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt
index fac5e0cdcc1..c42ecd99000 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/baseClassFragment/baseClassFragment.kt
@@ -8,9 +8,8 @@ fun Fragment.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC
-// 4 INVOKEVIRTUAL
-// 2 CHECKCAST
-// 0  _\$_findCachedViewById
-// 2 findViewById
-// 2 getView
\ No newline at end of file
+// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 CHECKCAST android/widget/Button
+// 2 INVOKEVIRTUAL android/app/Fragment\.getView
+// 2 INVOKEVIRTUAL android/view/View\.findViewById
+// 0  _\$_findCachedViewById
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt
index 5ea50a48ee6..a53a518d9ac 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCache/clearCache.kt
@@ -6,9 +6,9 @@ import java.io.File
 import kotlinx.android.synthetic.*
 
 public class MyActivity : Activity() {
-    {clearFindViewByIdCache()}
+    init { clearFindViewByIdCache() }
 }
 
-// 5 INVOKEVIRTUAL
-// 1 CHECKCAST
-// 2  _\$_clearFindViewByIdCache
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_clearFindViewByIdCache
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt
index 97f1ae17cf6..2e444109162 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/clearCacheBaseClass/clearCacheBaseClass.kt
@@ -9,4 +9,4 @@ public fun Activity.a() {
     clearFindViewByIdCache()
 }
 
-// 0  clearFindViewByIdCache
\ No newline at end of file
+// 0 clearFindViewByIdCache
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt
index fec92fcb0e0..3ed457e41bd 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctions/extensionFunctions.kt
@@ -14,8 +14,8 @@ fun MyActivity.b() {
     val y = this.login
 }
 
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/extensionFunctionsBaseClass.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/extensionFunctionsBaseClass.kt
deleted file mode 100644
index 8d45c659bbc..00000000000
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/extensionFunctionsBaseClass.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.myapp
-
-import android.app.Activity
-import android.os.Bundle
-import java.io.File
-import kotlinx.android.synthetic.layout.*
-
-public class MyActivity : Activity() {
-
-}
-
-fun Activity.b() {
-    val x = login
-    val y = this.login
-}
-
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 1  _\$_findCachedViewById
-// 3 findViewById
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/res/layout/layout.xml
deleted file mode 100644
index 4d73173b521..00000000000
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/res/layout/layout.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:id="@+id/item_detail_container"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".ItemDetailActivity"
-             tools:ignore="MergeRootFrame" >
-
-
-
-    <Button
-        android:id="@+id/login"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Sign in" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/extensionFunctionsBaseClassFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/extensionFunctionsBaseClassFragment.kt
deleted file mode 100644
index 4245529dffe..00000000000
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/extensionFunctionsBaseClassFragment.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.myapp
-
-import android.app.Fragment
-import android.os.Bundle
-import java.io.File
-import kotlinx.android.synthetic.layout.*
-
-public class MyFragment : Fragment() {
-
-}
-
-fun Fragment.b() {
-    val x = login
-    val y = this.login
-}
-
-// 2 GETSTATIC
-// 9 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 1  _\$_findCachedViewById
-// 3 findViewById
-// 3 getView
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/res/layout/layout.xml b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/res/layout/layout.xml
deleted file mode 100644
index 4d73173b521..00000000000
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/res/layout/layout.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:tools="http://schemas.android.com/tools"
-             android:id="@+id/item_detail_container"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-             tools:context=".ItemDetailActivity"
-             tools:ignore="MergeRootFrame" >
-
-
-
-    <Button
-        android:id="@+id/login"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Sign in" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
index fec92fcb0e0..6528bede199 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/extensionFunctionsFragment.kt
@@ -5,17 +5,16 @@ import android.os.Bundle
 import java.io.File
 import kotlinx.android.synthetic.layout.*
 
-public class MyActivity : Activity() {
-
-}
+public class MyActivity : Activity()
 
 fun MyActivity.b() {
     val x = login
     val y = this.login
 }
 
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyActivity\.findViewById
+// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt
index c929528a47b..35c5238a85a 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsView/extensionFunctionsView.kt
@@ -8,8 +8,7 @@ fun View.a() {
     val y = this.login
 }
 
-// 2 GETSTATIC
-// 2 INVOKEVIRTUAL
-// 2 CHECKCAST
-// 0 _\$_findCachedViewById
-// 2 findViewById
\ No newline at end of file
+// 2 GETSTATIC com/myapp/R\$id\.login
+// 2 INVOKEVIRTUAL android/view/View\.findViewById
+// 2 CHECKCAST android/widget/Button
+// 0 _\$_findCachedViewById
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt
index 16d6bbd7401..34c0d483e40 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttr/fqNameInAttr.kt
@@ -8,8 +8,8 @@ class MyActivity: Activity() {
     val button2 = MyButton
 }
 
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 2 GETSTATIC com/myapp/R\$id\.MyButton
+// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
index 58f79d7a266..92fe5a19eb7 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInAttrFragment/fqNameInAttrFragment.kt
@@ -8,9 +8,9 @@ class MyFragment: Fragment() {
     val button2 = MyButton
 }
 
-// 2 GETSTATIC
-// 7 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
-// 1 getView
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
+// 2 GETSTATIC com/myapp/R\$id\.MyButton
+// 2 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt
index 16d6bbd7401..34c0d483e40 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTag/fqNameInTag.kt
@@ -8,8 +8,8 @@ class MyActivity: Activity() {
     val button2 = MyButton
 }
 
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 2 GETSTATIC com/myapp/R\$id\.MyButton
+// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
index 58f79d7a266..92fe5a19eb7 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/fqNameInTagFragment/fqNameInTagFragment.kt
@@ -8,9 +8,9 @@ class MyFragment: Fragment() {
     val button2 = MyButton
 }
 
-// 2 GETSTATIC
-// 7 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
-// 1 getView
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
+// 2 GETSTATIC com/myapp/R\$id\.MyButton
+// 2 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt
index 7a3c286eef7..1ab62d2f1bb 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFile/multiFile.kt
@@ -9,8 +9,9 @@ class MyActivity: Activity() {
     val button1 = this.loginButton
 }
 
-// 2 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 3  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 GETSTATIC com/myapp/R\$id\.login : I
+// 1 GETSTATIC com/myapp/R\$id\.loginButton : I
+// 2 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
index f9310d768d9..5c0d87bff9b 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/multiFileFragment/multiFileFragment.kt
@@ -13,9 +13,11 @@ class MyFragment: Fragment() {
     val button1 = this.loginButton
 }
 
-// 2 GETSTATIC
-// 11 INVOKEVIRTUAL
-// 4 CHECKCAST
-// 4  _\$_findCachedViewById
-// 2 findViewById
-// 1 getView
\ No newline at end of file
+// 2 public _\$_findCachedViewById
+// 2 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
+// 1 GETSTATIC com/myapp/R\$id\.login : I
+// 1 GETSTATIC com/myapp/R\$id\.loginButton : I
+// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 2 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt
index ee901e8e592..ea9563b64f0 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt
@@ -9,8 +9,8 @@ public class MyActivity : Activity() {
     {login}
 }
 
-// 1 GETSTATIC
-// 5 INVOKEVIRTUAL
-// 2 CHECKCAST
-// 2  _\$_findCachedViewById
-// 1 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 GETSTATIC com/myapp/R\$id\.login
+// 1 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
index d4d737be36c..b34a70ec388 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt
@@ -8,9 +8,9 @@ public class MyFragment : Fragment() {
     {login}
 }
 
-// 1 GETSTATIC
-// 6 INVOKEVIRTUAL
-// 2 CHECKCAST
-// 2  _\$_findCachedViewById
-// 1 findViewById
-// 1 getView
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\.getView
+// 1 GETSTATIC com/myapp/R\$id\.login
+// 1 INVOKEVIRTUAL com/myapp/MyFragment\._\$_findCachedViewById
+// 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt
index a5ea852caf7..70d5a5dd089 100644
--- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt
+++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt
@@ -8,8 +8,10 @@ public class MyActivity : Activity() {
     { View(this).login }
 }
 
-// 1 GETSTATIC
-// 5 INVOKEVIRTUAL
-// 3 CHECKCAST
-// 1 _\$_findCachedViewById
-// 2 findViewById
\ No newline at end of file
+// 1 public _\$_findCachedViewById
+// 1 INVOKEVIRTUAL com/myapp/MyActivity\.findViewById
+// 1 public _\$_clearFindViewByIdCache
+// 1 GETSTATIC com/myapp/R\$id\.login
+// 1 INVOKEVIRTUAL android/view/View\.findViewById
+// 0 INVOKEVIRTUAL com/myapp/MyActivity\._\$_findCachedViewById
+// 1 CHECKCAST android/widget/Button
\ No newline at end of file
diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
index 01b152c1f08..fff30cfea44 100644
--- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
+++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java
@@ -66,18 +66,6 @@ public class AndroidBytecodeShapeTestGenerated extends AbstractAndroidBytecodeSh
         doTest(fileName);
     }
 
-    @TestMetadata("extensionFunctionsBaseClass")
-    public void testExtensionFunctionsBaseClass() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClass/");
-        doTest(fileName);
-    }
-
-    @TestMetadata("extensionFunctionsBaseClassFragment")
-    public void testExtensionFunctionsBaseClassFragment() throws Exception {
-        String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsBaseClassFragment/");
-        doTest(fileName);
-    }
-
     @TestMetadata("extensionFunctionsFragment")
     public void testExtensionFunctionsFragment() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("plugins/android-compiler-plugin/testData/codegen/bytecodeShape/extensionFunctionsFragment/");