From 8069dff4cd3e4f895c76677d1e468a8ee8a3f72e Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Thu, 19 Apr 2018 17:06:55 -0700
Subject: [PATCH] Clean up Polymer fn import

---
 test/smoke/behavior-mixin.html                |   3 +-
 test/smoke/data-table.html                    |   9 +-
 test/smoke/passive-gestures.html              |   3 +-
 test/unit/behaviors.html                      |   6 +-
 test/unit/configure.html                      |  21 +--
 test/unit/custom-style-async.html             |   3 +-
 test/unit/custom-style-late.html              |   3 +-
 test/unit/custom-style-scope-cache.html       |   3 +-
 test/unit/debounce.html                       |   3 +-
 test/unit/globals.html                        |   6 +-
 test/unit/logging.html                        |   3 +-
 test/unit/mixin-behaviors.html                |   3 +-
 test/unit/multi-style.html                    |   3 +-
 test/unit/polymer-dom-observeNodes.html       |  36 ++---
 test/unit/polymer-dom.html                    |  12 +-
 test/unit/ready-attached-order.html           |  15 +-
 test/unit/shady-content.html                  |  54 +++-----
 test/unit/shady-dynamic.html                  | 129 ++++++------------
 test/unit/shady-events.html                   |   9 +-
 test/unit/shady.html                          |   3 +-
 test/unit/styling-cross-scope-apply.html      |  39 ++----
 .../styling-cross-scope-unknown-host.html     |   6 +-
 test/unit/styling-cross-scope-var.html        |  72 ++++------
 test/unit/styling-scoped.html                 |  51 +++----
 test/unit/template-whitespace.html            |  18 +--
 25 files changed, 171 insertions(+), 342 deletions(-)

diff --git a/test/smoke/behavior-mixin.html b/test/smoke/behavior-mixin.html
index b8cdaa7873..e975f2c765 100644
--- a/test/smoke/behavior-mixin.html
+++ b/test/smoke/behavior-mixin.html
@@ -22,8 +22,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { DomModule } from '../../lib/elements/dom-module.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 /** @polymerBehavior */
diff --git a/test/smoke/data-table.html b/test/smoke/data-table.html
index d992b065fd..5690f1fde6 100644
--- a/test/smoke/data-table.html
+++ b/test/smoke/data-table.html
@@ -47,8 +47,7 @@
       <slot></slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-popup'
 });
@@ -97,8 +96,7 @@
       <data-popup>{{value}}</data-popup>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-cell',
   properties: {
@@ -159,8 +157,7 @@
       </template>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'data-row',
   properties: {
diff --git a/test/smoke/passive-gestures.html b/test/smoke/passive-gestures.html
index 5f15dcb1bb..22706d5ded 100644
--- a/test/smoke/passive-gestures.html
+++ b/test/smoke/passive-gestures.html
@@ -40,8 +40,7 @@
     </template>
   </dom-module>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-passive',
   listeners: {
diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
index 739c1353eb..2070ee213f 100644
--- a/test/unit/behaviors.html
+++ b/test/unit/behaviors.html
@@ -24,8 +24,7 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 window.BehaviorA = {
   properties: {
 
@@ -311,8 +310,7 @@
     </template>
   </test-fixture>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 suite('single behavior element', function() {
   var el;
diff --git a/test/unit/configure.html b/test/unit/configure.html
index 4e137e30d4..ceea00da02 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -39,8 +39,7 @@
       <span id="content">{{content}}</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-value',
@@ -78,8 +77,7 @@
       <span id="content">{{content}}</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-gchild',
@@ -117,8 +115,7 @@
       <x-configure-gchild id="gchild" content="{{content}}" object="{{object}}"></x-configure-gchild>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-child',
@@ -185,8 +182,7 @@
 
   <dom-module id="x-configure-simple-child">
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-simple-child',
@@ -218,8 +214,7 @@
       <x-configure-simple-child id="simple" noeffect="{{simple}}"></x-configure-simple-child>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
 
   is: 'x-configure-host',
@@ -324,8 +319,7 @@
       <x-config-lazy-nodefaults prop="[[foo]]"></x-config-lazy-nodefaults>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-config-lazy-host',
   properties: {
@@ -350,8 +344,7 @@
   <x-configure-host content="attr"></x-configure-host>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 function testValueAndChangeHandler(e, value) {
   assert.equal(e.content, value, 'Property does not equal configured value');
diff --git a/test/unit/custom-style-async.html b/test/unit/custom-style-async.html
index 1452b3aa16..b051d35a13 100644
--- a/test/unit/custom-style-async.html
+++ b/test/unit/custom-style-async.html
@@ -33,8 +33,7 @@
     </template>
   </dom-module>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-host'
 });
diff --git a/test/unit/custom-style-late.html b/test/unit/custom-style-late.html
index 1f2ad3c4f2..bb76056f01 100644
--- a/test/unit/custom-style-late.html
+++ b/test/unit/custom-style-late.html
@@ -42,8 +42,7 @@
   <x-input id="input"></x-input>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { afterNextRender } from '../../lib/utils/render-status.js';
 /* global input */
 
diff --git a/test/unit/custom-style-scope-cache.html b/test/unit/custom-style-scope-cache.html
index b8c64279c4..b5909e88fa 100644
--- a/test/unit/custom-style-scope-cache.html
+++ b/test/unit/custom-style-scope-cache.html
@@ -36,8 +36,7 @@
       cache-element
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'cache-element'
 });
diff --git a/test/unit/debounce.html b/test/unit/debounce.html
index 34c62a9ff5..94393e6c7d 100644
--- a/test/unit/debounce.html
+++ b/test/unit/debounce.html
@@ -30,8 +30,7 @@
   </test-fixture>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { Debouncer } from '../../lib/utils/debounce.js';
 import { microTask, timeOut, animationFrame, idlePeriod } from '../../lib/utils/async.js';
 Polymer({is: 'x-basic'});
diff --git a/test/unit/globals.html b/test/unit/globals.html
index 29155a644f..b099e376dc 100644
--- a/test/unit/globals.html
+++ b/test/unit/globals.html
@@ -36,8 +36,7 @@
     <div class$="{{stuff.is.here}}">{{bindings(are, cool)}}</div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'global-test',
   properties: {
@@ -64,8 +63,7 @@
 <global-test></global-test>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 
 suite('globals', function() {
 
diff --git a/test/unit/logging.html b/test/unit/logging.html
index 93a7b6323d..58eae3a4f1 100644
--- a/test/unit/logging.html
+++ b/test/unit/logging.html
@@ -19,8 +19,7 @@
 <body>
   <dom-module id="x-logging">
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-logging',
   properties: {
diff --git a/test/unit/mixin-behaviors.html b/test/unit/mixin-behaviors.html
index e95454f310..059f92f920 100644
--- a/test/unit/mixin-behaviors.html
+++ b/test/unit/mixin-behaviors.html
@@ -377,8 +377,7 @@
     </template>
   </test-fixture>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { mixinBehaviors } from '../../lib/legacy/class.js';
 import { PolymerElement } from '../../polymer-element.js';
 
diff --git a/test/unit/multi-style.html b/test/unit/multi-style.html
index c7ccc02812..941eabb4a3 100644
--- a/test/unit/multi-style.html
+++ b/test/unit/multi-style.html
@@ -62,8 +62,7 @@
   </dom-module>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { PolymerElement } from '../../polymer-element.js';
 import { DomModule } from '../../lib/elements/dom-module.js';
 suite('elements including multiple styles', function() {
diff --git a/test/unit/polymer-dom-observeNodes.html b/test/unit/polymer-dom-observeNodes.html
index d3c4a4f369..400763fb1a 100644
--- a/test/unit/polymer-dom-observeNodes.html
+++ b/test/unit/polymer-dom-observeNodes.html
@@ -23,8 +23,7 @@
       <slot id="slot"></slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { dom } from '../../lib/legacy/polymer.dom.js';
 Polymer({
   is:'test-self-observe',
@@ -45,8 +44,7 @@
       <div>static</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-static'
 });
@@ -58,8 +56,7 @@
       <span id="slotContainer">[<slot id="slot"></slot>]</span>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot'
 });
@@ -71,8 +68,7 @@
       <test-slot id="slot"><slot></slot></test-slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot1'
 });
@@ -84,8 +80,7 @@
       <test-slot1 id="slot"><slot></slot></test-slot1>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot2'
 });
@@ -97,8 +92,7 @@
       <test-slot2 id="slot"><slot></slot></test-slot2>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot3'
 });
@@ -110,8 +104,7 @@
       <div id="slot"><slot></slot></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-raw'
 });
@@ -123,8 +116,7 @@
       [<slot id="slot" name="d"></slot>]
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr'
 });
@@ -136,8 +128,7 @@
       <test-slot-attr id="slot"><slot name="c" slot="d"></slot></test-slot-attr>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr1'
 });
@@ -149,8 +140,7 @@
       <test-slot-attr1 id="slot"><slot name="b" slot="c"></slot></test-slot-attr1>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr2'
 });
@@ -162,8 +152,7 @@
       <test-slot-attr2 id="slot"><slot name="a" slot="b"></slot></test-slot-attr2>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr3'
 });
@@ -175,8 +164,7 @@
       <test-slot-attr3 id="slot"><slot name="a" slot="a"></slot></test-slot-attr3>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is:'test-slot-attr-inside'
 });
diff --git a/test/unit/polymer-dom.html b/test/unit/polymer-dom.html
index 2359e0eacc..6912a70647 100644
--- a/test/unit/polymer-dom.html
+++ b/test/unit/polymer-dom.html
@@ -23,8 +23,7 @@
       <div id="container"><slot id="slot"></slot></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-slot'
 });
@@ -36,8 +35,7 @@
       <x-slot id="container"><div id="first">first</div><slot id="slot"></slot><div id="last">last</div></x-slot>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-container-slot'
 });
@@ -49,8 +47,7 @@
       <div id="scoped"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-event-scoped',
   fireComposed: function() {
@@ -65,8 +62,7 @@
       <input id="focusable"></input>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-focusable-in-shadow'
 });
diff --git a/test/unit/ready-attached-order.html b/test/unit/ready-attached-order.html
index 3b670caf4b..709b5ea0b3 100644
--- a/test/unit/ready-attached-order.html
+++ b/test/unit/ready-attached-order.html
@@ -62,8 +62,7 @@
     x-zot<slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-zot',
   behaviors: [window.readyBehavior]
@@ -76,8 +75,7 @@
     <x-zot id="zot"></x-zot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-bar',
   behaviors: [window.readyBehavior]
@@ -91,8 +89,7 @@
     <x-bar id="bar2"></x-bar>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-foo',
   behaviors: [window.readyBehavior]
@@ -111,8 +108,7 @@
     <x-foo id="foo"></x-foo>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-ready',
   properties: {
@@ -133,8 +129,7 @@
     </template>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-templatized',
   properties: {
diff --git a/test/unit/shady-content.html b/test/unit/shady-content.html
index 1a78a5c605..c758b5da54 100644
--- a/test/unit/shady-content.html
+++ b/test/unit/shady-content.html
@@ -33,8 +33,7 @@
     <div id="distWrapper"><slot id="content"></slot></div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dist'});
 </script>
 </dom-module>
@@ -44,8 +43,7 @@
     <slot id="content"></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dist-simple'});
 </script>
 </dom-module>
@@ -53,8 +51,7 @@
 <dom-module id="x-dist-star">
   <template><slot></slot></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dist-star'});
 </script>
 </dom-module>
@@ -73,8 +70,7 @@
     <div></div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dist-inside-deep-tree'});
 </script>
 </dom-module>
@@ -82,8 +78,7 @@
 <dom-module id="x-no-dist">
   <template><span id="static">x-no-dist</span></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-no-dist'});
 </script>
 </dom-module>
@@ -93,8 +88,7 @@
     <x-dist id="dist"></x-dist>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-compose-dist'});
 </script>
 </dom-module>
@@ -104,8 +98,7 @@
     <x-no-dist id="noDist"></x-no-dist>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-compose-no-dist'});
 </script>
 </dom-module>
@@ -125,8 +118,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dynamic-content'});
 </script>
 </dom-module>
@@ -142,8 +134,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dynamic-content-wrapped'});
 </script>
 </dom-module>
@@ -157,8 +148,7 @@
     </x-dynamic-content>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dynamic-content-redist'});
 </script>
 </dom-module>
@@ -172,8 +162,7 @@
     </template>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dynamic-content-redist-element'});
 </script>
 </dom-module>
@@ -190,8 +179,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-dynamic-content-and-dynamic-no-content'});
 </script>
 </dom-module>
@@ -202,8 +190,7 @@
     <x-dist id="dist2"><slot id="content2"></slot></x-dist>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-multi-dist'});
 </script>
 </dom-module>
@@ -221,8 +208,7 @@
     </x-lazy-no-dist>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-compose-lazy-no-dist'});
 </script>
 </dom-module>
@@ -245,8 +231,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-toggle-if',
   properties: {
@@ -266,8 +251,7 @@
     </x-dist-inside-deep-tree>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-repeat',
   properties: {
@@ -289,8 +273,7 @@
     </x-dist-star>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-repeat2',
   properties: {
@@ -316,8 +299,7 @@
   }
 </script>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 import { flush as flush$0 } from '../../lib/utils/flush.js';
 function createPatchedDocumentFragment() {
   var frag = document.createDocumentFragment();
diff --git a/test/unit/shady-dynamic.html b/test/unit/shady-dynamic.html
index 9a5cdf0f9b..dec1d50dcb 100644
--- a/test/unit/shady-dynamic.html
+++ b/test/unit/shady-dynamic.html
@@ -33,8 +33,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-project'
 });
@@ -46,8 +45,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-reproject'
 });
@@ -59,8 +57,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-rereproject',
   attachedCount: 0,
@@ -76,8 +73,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-test'
 });
@@ -89,8 +85,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-test-no-distribute'
 });
@@ -114,8 +109,7 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: "x-distribute"
 });
@@ -125,8 +119,7 @@
   <template><x-project id="project"></x-project></template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-compose'
 });
@@ -136,8 +129,7 @@
 <dom-module id="x-select3">
   <template><slot id="x-select3-slot" name="s3"></slot></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-select3'});
 </script>
 </dom-module>
@@ -145,8 +137,7 @@
 <dom-module id="x-select2">
   <template><x-select3 id="select"><slot id="x-select2-slot" name="s2"></slot></x-select3></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-select2'});
 </script>
 </dom-module>
@@ -154,8 +145,7 @@
 <dom-module id="x-select1">
   <template><x-select2 id="select"><slot id="x-select1-slot" name="s1"></slot></x-select2></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-select1'});
 </script>
 </dom-module>
@@ -163,8 +153,7 @@
 <dom-module id="x-echo">
   <template><slot></slot></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-echo'});
 </script>
 </dom-module>
@@ -172,8 +161,7 @@
 <dom-module id="x-simple">
   <template><div>simple</div></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-simple'});
 </script>
 </dom-module>
@@ -185,8 +173,7 @@
     <x-echo id="echo2"><slot name="b"></slot></x-echo>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-redistribute-a-b'});
 </script>
 </dom-module>
@@ -194,8 +181,7 @@
 <dom-module id="x-attr">
   <template>Attr1</template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-attr',
   hostAttributes: {
@@ -209,8 +195,7 @@
 <dom-module id="x-attr2">
   <template>Attr2</template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-attr2',
   // TODO(sorvell): cannot put `slot` into properties because it is patched.
@@ -228,8 +213,7 @@
     Bar: [<slot name="bar"></slot>]
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-select-attr'});
 </script>
 </dom-module>
@@ -242,8 +226,7 @@
     </x-select-attr>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-compose-select-attr'});
 </script>
 </dom-module>
@@ -252,8 +235,7 @@
 <dom-module id="x-clonate">
   <template><span>[</span><slot></slot><span>]</span></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-clonate'
 });
@@ -283,8 +265,7 @@
     </template>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-attach3',
   properties: {
@@ -327,8 +308,7 @@
     </template>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-attach2',
   properties: {
@@ -368,8 +348,7 @@
     <x-attach2><div class="slotContainer"><slot></slot><div></x-attach2>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-attach1',
   attached: function() {
@@ -384,8 +363,7 @@
 <dom-module id="x-commented">
   <template><span>[</span><!--comment--><slot></slot></span><span>]</span></slot></template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-commented'});
 </script>
 </dom-module>
@@ -406,8 +384,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'polymer-dom-repeat',
   properties: {
@@ -427,8 +404,7 @@
     <slot name="light"></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-deep-contains',
   created: function() {
@@ -445,8 +421,7 @@
 
 <dom-module id="x-wrapped">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-wrapped'
 });
@@ -459,8 +434,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-0',
   hostAttributes: {
@@ -472,8 +446,7 @@
 
 <dom-module id="x-shadow-host-root-0-0-light-0">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-0-light-0',
   hostAttributes: {
@@ -492,8 +465,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-0-light',
   hostAttributes: {
@@ -508,8 +480,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-1',
   hostAttributes: {
@@ -521,8 +492,7 @@
 
 <dom-module id="x-shadow-host-root-0-1-light">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-1-light',
   hostAttributes: {
@@ -545,8 +515,7 @@
     </x-shadow-host-root-0-1>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0',
   hostAttributes: {
@@ -558,8 +527,7 @@
 
 <dom-module id="x-shadow-host-root-0-light">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-0-light',
   hostAttributes: {
@@ -574,8 +542,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-0',
   hostAttributes: {
@@ -587,8 +554,7 @@
 
 <dom-module id="x-shadow-host-root-1-0-light">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-0-light',
   hostAttributes: {
@@ -603,8 +569,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-1',
   hostAttributes: {
@@ -616,8 +581,7 @@
 
 <dom-module id="x-shadow-host-root-1-1-light">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-1-light',
   hostAttributes: {
@@ -646,8 +610,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1',
   hostAttributes: {
@@ -659,8 +622,7 @@
 
 <dom-module id="x-shadow-host-root-1-light-0">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-light-0',
   hostAttributes: {
@@ -675,8 +637,7 @@
     <x-shadow-host-root-1-light-0></x-shadow-host-root-1-light-0>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-1-light',
   hostAttributes: {
@@ -703,8 +664,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root',
   hostAttributes: {
@@ -716,8 +676,7 @@
 
 <dom-module id="x-shadow-host-root-light">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-shadow-host-root-light',
   hostAttributes: {
@@ -734,8 +693,7 @@
     </x-inner>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-outer'
 });
@@ -744,8 +702,7 @@
 
 <dom-module id="x-inner">
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-inner',
   attached: function(){
diff --git a/test/unit/shady-events.html b/test/unit/shady-events.html
index a0d7149e6e..0603c9df0d 100644
--- a/test/unit/shady-events.html
+++ b/test/unit/shady-events.html
@@ -31,8 +31,7 @@
       <div id="scoped" on-composed="childHandler" on-scoped="childHandler"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-event-scoped',
   properties: {
@@ -87,8 +86,7 @@
       <div id="child" on-focus="focusHandler"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-focus',
   properties: {
@@ -123,8 +121,7 @@
       <div id="child2"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-a',
   listeners: {
diff --git a/test/unit/shady.html b/test/unit/shady.html
index c08cb099c9..9045adcd4c 100644
--- a/test/unit/shady.html
+++ b/test/unit/shady.html
@@ -19,8 +19,7 @@
 <body>
 <template></template>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 var template = document.querySelector('template');
 Polymer({
   is: 'x-content-test',
diff --git a/test/unit/styling-cross-scope-apply.html b/test/unit/styling-cross-scope-apply.html
index 6536a5d60d..0e42a44b53 100644
--- a/test/unit/styling-cross-scope-apply.html
+++ b/test/unit/styling-cross-scope-apply.html
@@ -39,8 +39,7 @@
       </div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'story-card'});
 </script>
   </dom-module>
@@ -99,8 +98,7 @@
       <div id="mixin9">mixin9</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-child-scope'});
 </script>
   </dom-module>
@@ -151,8 +149,7 @@
       x-keyframes
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-keyframes',
   properties: {
@@ -280,8 +277,7 @@
       <div id="override">override</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-scope'});
 </script>
   </dom-module>
@@ -299,8 +295,7 @@
     </style>
         </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-var-produce-via-consume'
 });
@@ -319,8 +314,7 @@
     X
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-cache-child'
 });
@@ -341,8 +335,7 @@
     <x-cache-child id="child"></x-bad-child>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-cache-host-1'
 });
@@ -363,8 +356,7 @@
     <x-cache-child id="child"></x-bad-child>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-cache-host-2'
 });
@@ -386,8 +378,7 @@
     <div id="child">X</div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-no-paren-apply-only'
 });
@@ -404,8 +395,7 @@
     <div id="div"></div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-redefine-three'});
 </script>
 </dom-module>
@@ -422,8 +412,7 @@
     <x-redefine-three id="three"></x-redefine-three>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-redefine-two'});
 </script>
 </dom-module>
@@ -441,8 +430,7 @@
     <x-redefine-two id="two"></x-redefine-two>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-redefine-one'});
 </script>
 </dom-module>
@@ -485,8 +473,7 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'order-child'});
 Polymer({is: 'order-parent'});
 Polymer({is: 'order-gp'});
diff --git a/test/unit/styling-cross-scope-unknown-host.html b/test/unit/styling-cross-scope-unknown-host.html
index b6da6d6607..446f18487a 100644
--- a/test/unit/styling-cross-scope-unknown-host.html
+++ b/test/unit/styling-cross-scope-unknown-host.html
@@ -56,8 +56,7 @@
       x-foo
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-foo'
 });
@@ -74,8 +73,7 @@
       <unknown-host id="unknown"></unknown-host>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-nest',
 
diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
index b880ab37c0..8315cbb950 100644
--- a/test/unit/styling-cross-scope-var.html
+++ b/test/unit/styling-cross-scope-var.html
@@ -54,8 +54,7 @@
       <div id="child">From x-child-scope</div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-grand-child-scope'});
 </script>
   </dom-module>
@@ -76,8 +75,7 @@
       Host property
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-host-property'});
 </script>
   </dom-module>
@@ -87,8 +85,7 @@
       <x-host-property id="hosted"></x-host-property>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-host-host-property'});
 </script>
   </dom-module>
@@ -104,8 +101,7 @@
       <x-host-host-property id="hosted"></x-host-host-property>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-produce-use-property'});
 </script>
   </dom-module>
@@ -142,8 +138,7 @@
       <x-grand-child-scope id="gc4"></x-grand-child-scope>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-child-scope'});
 </script>
   </dom-module>
@@ -163,8 +158,7 @@
       <x-grand-child-scope id="gc1"></x-grand-child-scope>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-overrides'});
 </script>
   </dom-module>
@@ -188,8 +182,7 @@
       <x-grand-child-scope id="gc1"></x-grand-child-scope>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-overrides2'});
 </script>
   </dom-module>
@@ -205,8 +198,7 @@
       late
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-late'});
 </script>
   </dom-module>
@@ -229,8 +221,7 @@
       <x-late id="late"></x-late>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-overrides3'});
 </script>
   </dom-module>
@@ -248,8 +239,7 @@
       Element with default variable.
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-has-def'});
 </script>
   </dom-module>
@@ -266,8 +256,7 @@
       </template>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-has-if',
   properties: {
@@ -288,8 +277,7 @@
       Button!
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-button',
   extends: 'button'
@@ -309,8 +297,7 @@
       Dynamic
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-dynamic'
 });
@@ -361,8 +348,7 @@
       x-keyframes
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-keyframes',
   properties: {
@@ -535,8 +521,7 @@
       <div id="badFallback"></div>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-scope'
 });
@@ -556,8 +541,7 @@
       </style>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-inside'
 });
@@ -579,8 +563,7 @@
       <x-inside id="inner"></x-inside>
     </template>
     <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'simple-element'
 });
@@ -599,8 +582,7 @@
     </style>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-variable-override'
 });
@@ -617,8 +599,7 @@
     test
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-variable-consumer'
 });
@@ -641,8 +622,7 @@
     <x-variable-consumer id="consumer" class="foo"></x-variable-consumer>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-host-variable-consumer'
 });
@@ -660,8 +640,7 @@
     </style>
         </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-var-produce-via-consume'
 });
@@ -680,8 +659,7 @@
     <x-variable-consumer id="inside" class="foo"></x-variable-consumer>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-non-media-matching'
 });
@@ -704,8 +682,7 @@
     </style>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-non-media-matching-host'
 });
@@ -731,8 +708,7 @@
     <x-variable-consumer id="child" class="foo"></x-variable-consumer>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-update-styles',
   properties: {
diff --git a/test/unit/styling-scoped.html b/test/unit/styling-scoped.html
index 08f596d099..73bc49fb8b 100644
--- a/test/unit/styling-scoped.html
+++ b/test/unit/styling-scoped.html
@@ -77,8 +77,7 @@
     x-keyframes
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-keyframes',
   properties: {
@@ -99,8 +98,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-gchild'
 });
@@ -119,8 +117,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-child',
   hostAttributes: {
@@ -140,8 +137,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-child2'
 });
@@ -152,8 +148,7 @@
     <div id="scope">Trivial</div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-scope-class'
 });
@@ -275,8 +270,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-styled',
 
@@ -315,8 +309,7 @@
   </template>
 </dom-module>
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 var doc = window.document;
 var dynamic = doc.querySelector('template#dynamic');
 
@@ -342,8 +335,7 @@
 </template>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 var doc = window.document;
 var template = doc.querySelector('template#dynamic-style-template');
 
@@ -378,8 +370,7 @@
     <div id="container"></div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 var doc = window.document;
 var template = doc.querySelector('template#svg');
 
@@ -409,8 +400,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-specificity'});
 </script>
 </dom-module>
@@ -438,8 +428,7 @@
     <slot></slot>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-specificity-parent'});
 </script>
 </dom-module>
@@ -453,8 +442,7 @@
     </style>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-specificity-nested'});
 </script>
 </dom-module>
@@ -497,8 +485,7 @@
 </dom-module>
 
 <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'x-overriding'
 });
@@ -528,8 +515,7 @@
 
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-attr-selector'});
 </script>
 </dom-module>
@@ -560,8 +546,7 @@
     x-shared1
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-shared1'});
 </script>
 </dom-module>
@@ -572,8 +557,7 @@
     x-shared2
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-shared2'});
 </script>
 </dom-module>
@@ -597,8 +581,7 @@
     </div>
   </template>
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({is: 'x-slotted'});
 </script>
 </dom-module>
diff --git a/test/unit/template-whitespace.html b/test/unit/template-whitespace.html
index fe533cc0f1..273d9dd228 100644
--- a/test/unit/template-whitespace.html
+++ b/test/unit/template-whitespace.html
@@ -23,8 +23,7 @@
   <template> <div>A</div> <div>B</div> </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'has-whitespace'
 });
@@ -43,8 +42,7 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'no-whitespace'
 });
@@ -67,8 +65,7 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'no-whitespace-style'
 });
@@ -88,8 +85,7 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   is: 'no-whitespace-nested'
 });
@@ -112,8 +108,7 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   properties: {
     text: {value: 'text'},
@@ -138,8 +133,7 @@
   </template>
 
   <script type="module">
-import '../../polymer-legacy.js';
-import { Polymer } from '../../lib/legacy/polymer-fn.js';
+import { Polymer } from '../../polymer-legacy.js';
 Polymer({
   properties: {
     items: {